summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines/template_url.cc
diff options
context:
space:
mode:
authorrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:09:39 +0000
committerrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-13 16:09:39 +0000
commit58b6433d5199d559185f04a49496fb7acbc8df79 (patch)
treeb18c1a74f5011b16a8232c45c8abcae3b051cb7c /chrome/browser/search_engines/template_url.cc
parent19bcbfa963214916a9cd6958fac9487b48cbd071 (diff)
downloadchromium_src-58b6433d5199d559185f04a49496fb7acbc8df79.zip
chromium_src-58b6433d5199d559185f04a49496fb7acbc8df79.tar.gz
chromium_src-58b6433d5199d559185f04a49496fb7acbc8df79.tar.bz2
Fix for issue 51693, which was a regression from integrating the open source
version of RLZ into Chromium. Chromium should never send RLZ pings to Google, only Google Chrome should do so. Removing dependency from rlz chrome extenion api to RLZTracker since it is not required. BUG=51693 TEST=Install Chromium on a clean machine and make sure no pings are sent to http://client1.google.com/tools/pso/ping?... Review URL: http://codereview.chromium.org/3146007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url.cc')
-rw-r--r--chrome/browser/search_engines/template_url.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 8817267..29276a6 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -339,7 +339,7 @@ std::string TemplateURLRef::ReplaceSearchTerms(
// to happen so that we replace the RLZ template with the
// empty string. (If we don't handle this case, we hit a
// NOTREACHED below.)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
std::wstring rlz_string;
RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string);
if (!rlz_string.empty()) {