with the fixes needed so we everything will stay green.

BUG=None
TEST=None

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

TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/6189007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71197 0039d316-1c4b-4281-b951-d872f2087c98