Many fixes to bookmark importing.

chrome/browser/importer/external_process_importer_client.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/external_process_importer_client.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 #include "chrome/browser/importer/profile_import_process_host.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 ExternalProcessImporterClient::ExternalProcessImporterClient(
     ExternalProcessImporterHost* importer_host,
     const importer::SourceProfile& source_profile,
     uint16 items,
-    InProcessImporterBridge* bridge,
-    bool import_to_bookmark_bar)
-    : bookmarks_options_(0),
-      total_bookmarks_count_(0),
+    InProcessImporterBridge* bridge)
+    : total_bookmarks_count_(0),
       total_history_rows_count_(0),
       total_favicons_count_(0),
       process_importer_host_(importer_host),
       profile_import_process_host_(NULL),
       source_profile_(source_profile),
       items_(items),
-      import_to_bookmark_bar_(import_to_bookmark_bar),
       bridge_(bridge),
       cancelled_(false) {
   bridge_->AddRef();
   process_importer_host_->NotifyImportStarted();
 }
 
 ExternalProcessImporterClient::~ExternalProcessImporterClient() {
   bridge_->Release();
 }
 
@@ skipping 24 matching lines @@
       NewRunnableMethod(
           this,
           &ExternalProcessImporterClient::StartProcessOnIOThread,
           thread_id));
 }
 
 void ExternalProcessImporterClient::StartProcessOnIOThread(
     BrowserThread::ID thread_id) {
   profile_import_process_host_ =
       new ProfileImportProcessHost(this, thread_id);
-  profile_import_process_host_->StartProfileImportProcess(
-      source_profile_, items_, import_to_bookmark_bar_);
+  profile_import_process_host_->StartProfileImportProcess(source_profile_,
+                                                          items_);
 }
 
 void ExternalProcessImporterClient::Cancel() {
   if (cancelled_)
     return;
 
   cancelled_ = true;
   if (profile_import_process_host_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ skipping 73 matching lines @@
 void ExternalProcessImporterClient::OnHomePageImportReady(
     const GURL& home_page) {
   if (cancelled_)
     return;
 
   bridge_->AddHomePage(home_page);
 }
 
 void ExternalProcessImporterClient::OnBookmarksImportStart(
     const string16& first_folder_name,
-    int options,
     size_t total_bookmarks_count) {
   if (cancelled_)
     return;
 
   bookmarks_first_folder_name_ = first_folder_name;
-  bookmarks_options_ = options;
   total_bookmarks_count_ = total_bookmarks_count;
   bookmarks_.reserve(total_bookmarks_count);
 }
 
 void ExternalProcessImporterClient::OnBookmarksImportGroup(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks_group) {
   if (cancelled_)
     return;
 
   // Collect sets of bookmarks from importer process until we have reached
   // total_bookmarks_count_:
   bookmarks_.insert(bookmarks_.end(), bookmarks_group.begin(),
                     bookmarks_group.end());
-  if (bookmarks_.size() == total_bookmarks_count_) {
-    bridge_->AddBookmarks(bookmarks_, bookmarks_first_folder_name_,
-                          bookmarks_options_);
-  }
+  if (bookmarks_.size() == total_bookmarks_count_)
+    bridge_->AddBookmarks(bookmarks_, bookmarks_first_folder_name_);
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportStart(
     size_t total_favicons_count) {
   if (cancelled_)
     return;
 
   total_favicons_count_ = total_favicons_count;
   favicons_.reserve(total_favicons_count);
 }
@@ skipping 27 matching lines @@
   template_url_vec.reserve(template_urls.size());
   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);
 }