Many fixes to bookmark importing.

chrome/profile_import/profile_import_thread.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/profile_import/profile_import_thread.h"
 
 #include <stddef.h>
 #include <algorithm>
 
 #include "base/message_loop.h"
@@ skipping 36 matching lines @@
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_ReportImportItemFinished,
                         OnImportItemFinished)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ProfileImportThread::OnImportStart(
     const importer::SourceProfile& source_profile,
     uint16 items,
-    const DictionaryValue& localized_strings,
-    bool import_to_bookmark_bar) {
+    const DictionaryValue& localized_strings) {
   bridge_ = new ExternalProcessImporterBridge(this, localized_strings);
   importer_ = importer::CreateImporterByType(source_profile.importer_type);
   if (!importer_) {
     Send(new ProfileImportProcessHostMsg_Import_Finished(false,
         "Importer could not be created."));
     return;
   }
 
-  importer_->set_import_to_bookmark_bar(import_to_bookmark_bar);
   items_to_import_ = items;
 
   // Create worker thread in which importer runs.
   import_thread_.reset(new base::Thread("import_thread"));
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   if (!import_thread_->StartWithOptions(options)) {
     NOTREACHED();
     Cleanup();
   }
@@ skipping 52 matching lines @@
   }
 }
 
 void ProfileImportThread::NotifyHomePageImportReady(
     const GURL& home_page) {
   NOTIMPLEMENTED();
 }
 
 void ProfileImportThread::NotifyBookmarksImportReady(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-    const string16& first_folder_name,
-    int options) {
+    const string16& first_folder_name) {
   Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
-      first_folder_name, options, bookmarks.size()));
+      first_folder_name, bookmarks.size()));
 
   std::vector<ProfileWriter::BookmarkEntry>::const_iterator it;
   for (it = bookmarks.begin(); it < bookmarks.end();
        it = it + kNumBookmarksToSend) {
     std::vector<ProfileWriter::BookmarkEntry> bookmark_group;
     std::vector<ProfileWriter::BookmarkEntry>::const_iterator end_group =
         it + kNumBookmarksToSend < bookmarks.end() ?
         it + kNumBookmarksToSend : bookmarks.end();
     bookmark_group.assign(it, end_group);
 
@@ skipping 35 matching lines @@
   Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(urls,
       default_keyword_index, unique_on_host_and_path));
 }
 
 void ProfileImportThread::Cleanup() {
   importer_->Cancel();
   importer_ = NULL;
   bridge_ = NULL;
   ChildProcess::current()->ReleaseProcess();
 }