Fix various unittest failures.

Over the past few months some of the unittests have not kept up
with code changes and have stopped working.  This CL fixes that.

BUG=None
TEST=Ran all the unittests by hand.

Change-Id: I4fdd09846ae92ce2d45ec478a39ff3ece30b4579
Reviewed-on: https://chrome-internal-review.googlesource.com/214134
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
6 files changed