Merge 22284 - Refactoring of master preferences parsing before adding a new p...

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 23178)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -442,14 +442,16 @@
 
   BrowserInit browser_init;
 
+  int rlz_ping_delay = 0;
   if (is_first_run) {
     // On first run, we  need to process the master preferences before the
     // browser's profile_manager object is created, but after ResourceBundle
     // is initialized.
     std::vector<std::wstring> first_run_tabs;
-    first_run_ui_bypass =
-        !FirstRun::ProcessMasterPreferences(user_data_dir, FilePath(), NULL,
-                                            &first_run_tabs);
+    first_run_ui_bypass = !FirstRun::ProcessMasterPreferences(user_data_dir,
+                                                              FilePath(),
+                                                              &first_run_tabs,
+                                                              &rlz_ping_delay);
     // The master prefs might specify a set of urls to display.
     if (first_run_tabs.size())
       AddFirstRunNewTabs(&browser_init, first_run_tabs);
@@ -638,12 +640,10 @@
 
   win_util::ScopedCOMInitializer com_initializer;
 
-  int delay = 0;
-  installer_util::GetDistributionPingDelay(FilePath(), delay);
   // 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(base::DIR_MODULE, is_first_run, delay);
+  RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run, rlz_ping_delay);
 #endif
 
   // Config the network module so it has access to resources.
Property changes on: chrome\browser\browser_main.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_main.cc:r22284