Google Now Code Cleanup

BUG=306613
R=isherman@chromium.org, rgustafson@chromium.org, skare@chromium.org, vadimt@chromium.org

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

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