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

chrome/browser/importer/importer.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/importer/importer.h"
 
 #include "app/l10n_util.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 322 matching lines @@
     Profile* target_profile,
     uint16 items,
     ProfileWriter* writer,
     bool first_run) {
   DCHECK(!profile_);
   profile_ = target_profile;
   writer_ = writer;
   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();
 }
 
 void ExternalProcessImporterHost::InvokeTaskIfDone() {
   if (waiting_for_bookmarkbar_model_ || !registrar_.IsEmpty() ||
       !is_source_readable_ || cancelled_)
     return;
 
   // The in-process half of the bridge which catches data from the IPC pipe
   // and feeds it to the ProfileWriter.  The external process half of the
@@ skipping 219 matching lines @@
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }