Many fixes to bookmark importing.

chrome/browser/importer/importer_host.cc

 // Copyright (c) 2011 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_host.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
@@ skipping 99 matching lines @@
   // notified.
   writer_ = writer;
   importer_ = importer::CreateImporterByType(source_profile.importer_type);
   // If we fail to create the Importer, exit, as we cannot do anything.
   if (!importer_) {
     NotifyImportEnded();
     return;
   }
 
   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));
   task_ = NewRunnableMethod(
       importer_, &Importer::StartImport, source_profile, items, bridge);
 
   CheckForFirefoxLock(source_profile, items, first_run);
 
 #if defined(OS_WIN)
   // For google toolbar import, we need the user to log in and store their GAIA
@@ skipping 33 matching lines @@
   if (NULL != importer_)
     importer_->Release();
 
   if (installed_bookmark_observer_) {
     DCHECK(profile_);  // Only way for waiting_for_bookmarkbar_model_ to be true
                        // is if we have a profile.
     profile_->GetBookmarkModel()->RemoveObserver(this);
   }
 }
 
-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,
     bool first_run) {
   if (source_profile.importer_type == importer::FIREFOX2 ||
       source_profile.importer_type == importer::FIREFOX3) {
     DCHECK(!firefox_lock_.get());
     firefox_lock_.reset(new FirefoxProfileLock(source_profile.source_path));
     if (!firefox_lock_->HasAcquired()) {
       // If fail to acquire the lock, we set the source unreadable and
@@ skipping 32 matching lines @@
     return;
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, task_);
 }
 
 void ImporterHost::Loaded(BookmarkModel* model) {
   DCHECK(model->IsLoaded());
   model->RemoveObserver(this);
   waiting_for_bookmarkbar_model_ = false;
   installed_bookmark_observer_ = false;
 
-  importer_->set_import_to_bookmark_bar(!model->HasBookmarks());
   InvokeTaskIfDone();
 }
 
 void ImporterHost::BookmarkModelBeingDeleted(BookmarkModel* model) {
   installed_bookmark_observer_ = false;
 }
 
 void ImporterHost::BookmarkModelChanged() {
 }
 
 void ImporterHost::Observe(NotificationType type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == NotificationType::TEMPLATE_URL_MODEL_LOADED);
   registrar_.RemoveAll();
   InvokeTaskIfDone();
 }