Many fixes to bookmark importing.

chrome/browser/importer/importer_host.cc

Index: chrome/browser/importer/importer_host.cc
diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index c81094cf5b5dc777de09c2b646b8ef580c8ab437..a012b8cb451a356b910af26d286fce0918105cf2 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -117,8 +117,6 @@ void ImporterHost::StartImportSettings(
   }
 
   importer_->AddRef();
-  importer_->set_import_to_bookmark_bar(ShouldImportToBookmarkBar(first_run));
-  importer_->set_bookmark_bar_disabled(first_run);
 
   scoped_refptr<InProcessImporterBridge> bridge(
       new InProcessImporterBridge(writer_.get(), this));
@@ -172,14 +170,6 @@ ImporterHost::~ImporterHost() {
   }
 }
 
-bool ImporterHost::ShouldImportToBookmarkBar(bool first_run) {
-  bool import_to_bookmark_bar = first_run;
-  if (profile_ && profile_->GetBookmarkModel()->IsLoaded()) {
-    import_to_bookmark_bar = (!profile_->GetBookmarkModel()->HasBookmarks());
-  }
-  return import_to_bookmark_bar;
-}
-
 void ImporterHost::CheckForFirefoxLock(
     const importer::SourceProfile& source_profile,
     uint16 items,
@@ -232,7 +222,6 @@ void ImporterHost::Loaded(BookmarkModel* model) {
   waiting_for_bookmarkbar_model_ = false;
   installed_bookmark_observer_ = false;
 
-  importer_->set_import_to_bookmark_bar(!model->HasBookmarks());
   InvokeTaskIfDone();
 }