diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-16 23:48:50 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-16 23:48:50 +0000 |
commit | ab1c2c816b1f08b56f539a172f4c0b2e2004168d (patch) | |
tree | 1c7501688e541792cacf76a1824c5736c6f6afbb /chrome/browser/search_engines | |
parent | aca0c5c993df1bb24b03e50108c0e8574d474928 (diff) | |
download | chromium_src-ab1c2c816b1f08b56f539a172f4c0b2e2004168d.zip chromium_src-ab1c2c816b1f08b56f539a172f4c0b2e2004168d.tar.gz chromium_src-ab1c2c816b1f08b56f539a172f4c0b2e2004168d.tar.bz2 |
Revert 132479 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA enabled.
BUG=123609
TEST=With UMA enabled (not Chromium), visit www.google.com and ensure that the request header includes X-Chrome-UMA-Enabled with value "1". Also, ensure that unit_tests GoogleUtilTests all pass.
Review URL: http://codereview.chromium.org/10054029
TBR=stevet@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10107009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
-rw-r--r-- | chrome/browser/search_engines/template_url_prepopulate_data.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index c8cdcc9..5f785ce 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -3281,10 +3281,8 @@ static const PrepopulatedEngine* GetEngineForURL(const std::string& url) { // First special-case Google, because the prepopulate URL for it will not // convert to a GURL and thus won't have an origin. Instead see if the // incoming URL's host is "[*.]google.<TLD>". - if (google_util::IsGoogleHostname(as_gurl.host(), - google_util::DISALLOW_SUBDOMAIN)) { + if (google_util::IsGoogleHostname(as_gurl.host())) return &google; - } // Now check the rest of the prepopulate data. GURL origin(as_gurl.GetOrigin()); |