Pull r129 of googleurl, plus r130 which adds a newline for the Mac.

      BUG=40445
TEST=unit test on the googleurl side
Review URL: http://codereview.chromium.org/1604018

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