Many fixes to bookmark importing.

chrome/browser/importer/profile_import_process_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/profile_import_process_host.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 11 matching lines @@
     : BrowserChildProcessHost(PROFILE_IMPORT_PROCESS),
       import_process_client_(import_process_client),
       thread_id_(thread_id) {
 }
 
 ProfileImportProcessHost::~ProfileImportProcessHost() {
 }
 
 bool ProfileImportProcessHost::StartProfileImportProcess(
     const importer::SourceProfile& source_profile,
-    uint16 items,
-    bool import_to_bookmark_bar) {
+    uint16 items) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!StartProcess())
     return false;
 
   // Dictionary of all localized strings that could be needed by the importer
   // in the external process.
   DictionaryValue localized_strings;
   localized_strings.SetString(
       base::IntToString(IDS_BOOKMARK_GROUP_FROM_FIREFOX),
       l10n_util::GetStringUTF8(IDS_BOOKMARK_GROUP_FROM_FIREFOX));
   localized_strings.SetString(
       base::IntToString(IDS_BOOKMARK_GROUP_FROM_SAFARI),
       l10n_util::GetStringUTF8(IDS_BOOKMARK_GROUP_FROM_SAFARI));
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_FIREFOX),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_FIREFOX));
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_GOOGLE_TOOLBAR),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_GOOGLE_TOOLBAR));
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_SAFARI),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI));
+  localized_strings.SetString(
+      base::IntToString(IDS_BOOMARK_BAR_FOLDER_NAME),
+      l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_FOLDER_NAME));
 
-  Send(new ProfileImportProcessMsg_StartImport(
-      source_profile, items, localized_strings, import_to_bookmark_bar));
+  Send(new ProfileImportProcessMsg_StartImport(source_profile, items,
+                                               localized_strings));
   return true;
 }
 
 bool ProfileImportProcessHost::CancelProfileImportProcess() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   Send(new ProfileImportProcessMsg_CancelImport());
   return true;
 }
 
 bool ProfileImportProcessHost::ReportImportItemFinished(
@@ skipping 63 matching lines @@
   BrowserThread::PostTask(
       thread_id_, FROM_HERE,
       NewRunnableMethod(import_process_client_.get(),
                         &ProfileImportProcessClient::OnProcessCrashed,
                         exit_code));
 }
 
 bool ProfileImportProcessHost::CanShutdown() {
   return true;
 }