Do not do AutoImport on Windows since the import process is already ran earlier as part of ProcessM…

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 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/chrome_browser_main.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 950 matching lines @@
       if (!master_prefs_->variations_seed.empty()) {
         local_state_->SetString(prefs::kVariationsSeed,
                                 master_prefs_->variations_seed);
         // Set the variation seed date to the current system time. If the user's
         // clock is incorrect, this may cause some field trial expiry checks to
         // not do the right thing until the next seed update from the server,
         // when this value will be updated.
         local_state_->SetInt64(prefs::kVariationsSeedDate,
                                base::Time::Now().ToInternalValue());
       }
-    } else if (parsed_command_line().HasSwitch(switches::kNoFirstRun)) {
-      // Create the First Run beacon anyways if --no-first-run was passed on the
-      // command line.
+    }
+
+    if (do_first_run_tasks_ ||
+        parsed_command_line().HasSwitch(switches::kNoFirstRun)) {
+      // Create the First Run sentinel whether first run tasks are executed
+      // or not.
       first_run::CreateSentinel();
     }
   }
 #endif
 
   // TODO(viettrungluu): why don't we run this earlier?
   if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs))
     WarnAboutMinimumSystemRequirements();
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
@@ skipping 346 matching lines @@
   if (g_browser_process->gl_string_manager())
     g_browser_process->gl_string_manager()->Initialize();
 
 #if !defined(OS_ANDROID)
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (do_first_run_tasks_) {
+// On Windows the import process was already launched from
+// ProcessMasterPreferences()-->SetImportPreferencesAndLaunchImport()-->
+// ImportSettingsWin().
+// Windows should really use the OOP import (http://crbug.com/22142), but for
+// now let's at least not run the import twice on Windows. It has to run before
+// the profile is created because the import process is designed to interact
+// with the profile itself (and trying to import at this point causes issues
+// like http://crbug.com/180459 and http://crbug.com/171475).

[Joao da Silva, 2013/03/12 13:32:05]

nit: indentation

[gab, 2013/03/25 16:00:43]

On purpose since comment is for the #if !defined(OS_WIN) below which is not
indented since it's a preprocessor directive.

+#if !defined(OS_WIN)

[Joao da Silva, 2013/03/12 13:32:05]

If OS_WIN, can we CHECK that the import process has already executed? Not sure
if that signal is available somewhere at this stage. Maybe
first_run::DidPerformProfileImport()?

[gab, 2013/03/25 16:00:43]

Good idea, done.

     first_run::AutoImport(profile_,
                           master_prefs_->homepage_defined,
                           master_prefs_->do_import_items,
                           master_prefs_->dont_import_items,
                           process_singleton_.get());
+#endif
     // Note: this can pop the first run consent dialog on linux.
     first_run::DoPostImportTasks(profile_, master_prefs_->make_chrome_default);
 
     browser_process_->profile_manager()->OnImportFinished(profile_);
 
     if (!master_prefs_->suppress_first_run_default_browser_prompt) {
       browser_creator_->set_show_main_browser_window(
           !chrome::ShowFirstRunDefaultBrowserPrompt(profile_));
     } else {
       browser_creator_->set_is_default_browser_dialog_suppressed(true);
@@ skipping 456 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }