Revert of https://codereview.chromium.org/68713009/
Reason for revert: Led to a URL bar display error, issue 324208.

TBR=benwells@chromium.org,creis@chromium.org,sky@chromium.org
NOTREECHECKS=true
NOTRY=true

BUG=324208

Review URL: https://codereview.chromium.org/99853005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241125 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 241125