Needed to fix a few function calls to make it work.

BUG=54084
TEST=unit tests

Review URL: http://codereview.chromium.org/3303004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@58287 0039d316-1c4b-4281-b951-d872f2087c98