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/browser_main.cc | |
| 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/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fc6511b..eff0c33 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1262,11 +1262,13 @@ int BrowserMain(const MainFunctionParams& parameters) { #if defined(OS_WIN) win_util::ScopedCOMInitializer com_initializer; +#if defined(GOOGLE_CHROME_BUILD) // Init the RLZ library. This just binds the dll and schedules a task on the // file thread to be run sometime later. If this is the first run we record // the installation event. RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay); #endif +#endif // Configure the network module so it has access to resources. net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |