Many fixes to bookmark importing.

chrome/browser/importer/external_process_importer_host.cc

Index: chrome/browser/importer/external_process_importer_host.cc
diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc
index 556040530ee430811a66dbed4d6c3db7e5a3da04..0891e346e24136c7a63005a124bc5de7532011e0 100644
--- a/chrome/browser/importer/external_process_importer_host.cc
+++ b/chrome/browser/importer/external_process_importer_host.cc
@@ -10,7 +10,6 @@
 
 ExternalProcessImporterHost::ExternalProcessImporterHost()
     : items_(0),
-      import_to_bookmark_bar_(false),
       cancelled_(false),
       import_process_launched_(false) {
 }
@@ -36,7 +35,6 @@ void ExternalProcessImporterHost::StartImportSettings(
 
   ImporterHost::AddRef();  // Balanced in ImporterHost::NotifyImportEnded.
 
-  import_to_bookmark_bar_ = ShouldImportToBookmarkBar(first_run);
   CheckForFirefoxLock(source_profile, items, first_run);
   CheckForLoadedModels(items);
 
@@ -55,8 +53,8 @@ void ExternalProcessImporterHost::InvokeTaskIfDone() {
   // and will delete it.
   InProcessImporterBridge* bridge =
       new InProcessImporterBridge(writer_.get(), this);
-  client_ = new ExternalProcessImporterClient(
-      this, *source_profile_, items_, bridge, import_to_bookmark_bar_);
+  client_ = new ExternalProcessImporterClient(this, *source_profile_, items_,

[tfarina, 2011/05/25 17:01:27]

When the args doesn't fit on the same line, write one arg per line. I'd prefer
you don't change it all if possible. This just increase the size of the diff and
makes it less readable (with no real benefit). Here and elsewhere you changed to
that style.

[Ilya Sherman, 2011/05/26 00:13:20]

This is not part of the style guide -- see [1].
[1] http://www.chromium.org/developers/coding-style#TOC-Code-formatting
I am not just re-wrapping the arguments here, I am also removing one.  So, the
diff would not be much smaller were the arguments not re-wrapped.

+                                              bridge);
   import_process_launched_ = true;
   client_->Start();
 }
@@ -67,9 +65,5 @@ void ExternalProcessImporterHost::Loaded(BookmarkModel* model) {
   waiting_for_bookmarkbar_model_ = false;
   installed_bookmark_observer_ = false;
 
-  // Because the import process is running externally, the decision whether
-  // to import to the bookmark bar must be stored here so that it can be
-  // passed to the importer when the import task is invoked.
-  import_to_bookmark_bar_ = (!model->HasBookmarks());
   InvokeTaskIfDone();
 }