1 files changed, 45 insertions, 7 deletions

diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm
index 2d9fe08..d394ddd 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,7 +6,51 @@
 
 #include "base/file_path.h"
 #include "base/string_util.h"
+#include "chrome/browser/first_run/first_run_internal.h"
+#include "chrome/browser/importer/importer_host.h"
+#include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/mac/master_prefs.h"
+#include "chrome/browser/process_singleton.h"
+
+namespace first_run {
+
+void AutoImport(
+    Profile* profile,
+    bool homepage_defined,
+    int import_items,
+    int dont_import_items,
+    bool search_engine_experiment,
+    bool randomize_search_engine_experiment,
+    bool make_chrome_default,
+    ProcessSingleton* process_singleton) {
+  // We need to avoid dispatching new tabs when we are importing because
+  // that will lead to data corruption or a crash. Because there is no UI for
+  // the import process, we pass NULL as the window to bring to the foreground
+  // when a CopyData message comes in; this causes the message to be silently
+  // discarded, which is the correct behavior during the import process.
+  process_singleton->Lock(NULL);
+
+  scoped_refptr<ImporterHost> importer_host;
+  // TODO(csilv,mirandac): Out-of-process import has only been qualified on
+  // MacOS X, so we will only use it on that platform since it is required.
+  // Remove this conditional logic once oop import is qualified for
+  // Linux/Windows. http://crbug.com/22142
+  importer_host = new ExternalProcessImporterHost;
+
+  internal::AutoImportPlatformCommon(importer_host,
+                                     profile,
+                                     homepage_defined,
+                                     import_items,
+                                     dont_import_items,
+                                     search_engine_experiment,
+                                     randomize_search_engine_experiment,
+                                     make_chrome_default);
+
+  process_singleton->Unlock();
+  first_run::CreateSentinel();
+}
+
+}  //namespace first_run
 
 bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
   // http://crbug.com/48880
@@ -14,12 +58,6 @@ bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
 }
 
 // static
-void FirstRun::PlatformSetup() {
-  // Things that Windows does here (creating a desktop icon, for example) are
-  // not needed.
-}
-
-// static
 FilePath FirstRun::MasterPrefsPath() {
   return master_prefs::MasterPrefsPath();
 }