Make import from the options menu OOP on Mac OS X.

BUG=46701
TEST=import Firefox passwords from the menu once the browser is running.  Because import is OOP, FF passwords should be imported.  All other import processes should still work as advertised.
Review URL: http://codereview.chromium.org/2800026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50753 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm
index 77fb985..a11244a 100644
--- a/chrome/browser/cocoa/import_settings_dialog.mm
+++ b/chrome/browser/cocoa/import_settings_dialog.mm
@@ -179,7 +179,7 @@ bool importSettingsDialogVisible = false;
   int16 servicesToImport = static_cast<int16>(items & [self servicesToImport]);
   if (servicesToImport) {
     if (profile_) {
-      ImporterHost* importerHost = new ImporterHost;
+      ImporterHost* importerHost = new ExternalProcessImporterHost;
       // Note that a side effect of the following call is to cause the
       // importerHost to be disposed once the import has completed.
       StartImportingWithUI(nil, servicesToImport, importerHost,
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 6c1ce32..fcb8f28 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -340,11 +340,12 @@ void ExternalProcessImporterHost::StartImportSettings(
   profile_info_ = &profile_info;
   items_ = items;
 
+  ImporterHost::AddRef();  // Balanced in ImporterHost::ImportEnded.
+
   import_to_bookmark_bar_ = ShouldImportToBookmarkBar(first_run);
   CheckForFirefoxLock(profile_info, items, first_run);
   CheckForLoadedModels(items);
 
-  ImporterHost::AddRef();  // Balanced in ImporterHost::ImportEnded.
   InvokeTaskIfDone();
 }