Merge r58176: Set default browser after import (OS Win)....

chrome/browser/first_run_win.cc

Index: chrome/browser/first_run_win.cc
===================================================================
--- chrome/browser/first_run_win.cc	(revision 58106)
+++ chrome/browser/first_run_win.cc	(working copy)
@@ -360,7 +360,7 @@
   if (installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
       value)
-    ShellIntegration::SetAsDefaultBrowser();
+    out_prefs->make_chrome_default = true;
 
   // TODO(mirandac): Refactor skip-first-run-ui process into regular first run
   // import process.  http://crbug.com/49647
@@ -417,6 +417,11 @@
     }
   }
 
+  if (installer_util::GetDistroBooleanPreference(prefs.get(),
+    installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
+    value)
+    ShellIntegration::SetAsDefaultBrowser();
+
   return false;
 }
 
@@ -628,6 +633,7 @@
     int dont_import_items,
     bool search_engine_experiment,
     bool randomize_search_engine_experiment,
+    bool make_chrome_default,
     ProcessSingleton* process_singleton) {
   FirstRun::CreateChromeDesktopShortcut();
   // Windows 7 has deprecated the quick launch bar.
@@ -706,6 +712,9 @@
     search_engine_dialog->Close();
   }
 
+  if (make_chrome_default)
+    ShellIntegration::SetAsDefaultBrowser();
+
   FirstRun::SetShowFirstRunBubblePref(true);
   // Set the first run bubble to minimal.
   FirstRun::SetMinimalFirstRunBubblePref();