diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 07:48:19 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 07:48:19 +0000 |
| commit | 216f461e3f2ae6a45936b243996e5439ec5ba137 (patch) | |
| tree | 6017aa85778818e34f98e204d63f57667b693137 | |
| parent | 9f56ba3188cd85632560e29a7a4852ba36469d73 (diff) | |
| download | chromium_src-216f461e3f2ae6a45936b243996e5439ec5ba137.zip chromium_src-216f461e3f2ae6a45936b243996e5439ec5ba137.tar.gz chromium_src-216f461e3f2ae6a45936b243996e5439ec5ba137.tar.bz2 | |
Reland r59492. Do not include RLZ parameters in search requests for organic installs.
BUG=55363
TEST=none
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/3404005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59621 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/search_engines/search_terms_data.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index ce2ffd5..45309a9 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -12,6 +12,7 @@ #if defined(OS_WIN) #include "chrome/browser/rlz/rlz.h" +#include "chrome/installer/util/google_update_settings.h" #endif SearchTermsData::SearchTermsData() { @@ -75,7 +76,12 @@ std::wstring UIThreadSearchTermsData::GetRlzParameterValue() const { DCHECK(!ChromeThread::IsWellKnownThread(ChromeThread::UI) || ChromeThread::CurrentlyOn(ChromeThread::UI)); std::wstring rlz_string; - RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); + // For organic brandcodes do not use rlz at all. Empty brandcode usually + // means a chromium install. This is ok. + std::wstring brand; + if (GoogleUpdateSettings::GetBrand(&brand) && !brand.empty() && + !GoogleUpdateSettings::IsOrganic(brand)) + RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); return rlz_string; } #endif |