diff options
| author | rogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:09:39 +0000 |
|---|---|---|
| committer | rogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:09:39 +0000 |
| commit | 58b6433d5199d559185f04a49496fb7acbc8df79 (patch) | |
| tree | b18c1a74f5011b16a8232c45c8abcae3b051cb7c /chrome/browser/rlz | |
| parent | 19bcbfa963214916a9cd6958fac9487b48cbd071 (diff) | |
| download | chromium_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/rlz')
| -rw-r--r-- | chrome/browser/rlz/rlz.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index c8a5cbd..b57224e 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -165,8 +165,8 @@ class DelayedInitTask : public Task { // For organic brandcodes do not use rlz at all. Empty brandcode usually // means a chromium install. This is ok. std::wstring brand; - GoogleUpdateSettings::GetBrand(&brand); - if (GoogleUpdateSettings::IsOrganic(brand)) + if (!GoogleUpdateSettings::GetBrand(&brand) || brand.empty() || + GoogleUpdateSettings::IsOrganic(brand)) return; // Do the initial event recording if is the first run or if we have an |