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

chrome/browser/browser_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1061 matching lines @@
   // touches reads preferences.
   if (is_first_run) {
     if (!first_run_ui_bypass) {
 #if defined(OS_WIN)
       FirstRun::AutoImport(profile,
                            master_prefs.homepage_defined,
                            master_prefs.do_import_items,
                            master_prefs.dont_import_items,
                            master_prefs.run_search_engine_experiment,
                            master_prefs.randomize_search_engine_experiment,
+                           master_prefs.make_chrome_default,
                            &process_singleton);
 #else
       if (!OpenFirstRunDialog(profile,
                               master_prefs.homepage_defined,
                               master_prefs.do_import_items,
                               master_prefs.dont_import_items,
                               master_prefs.run_search_engine_experiment,
                               master_prefs.randomize_search_engine_experiment,
                               &process_singleton)) {
         return ResultCodes::NORMAL_EXIT;
@@ skipping 220 matching lines @@
 
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   return result_code;
 }