Many fixes to bookmark importing.

chrome/browser/importer/profile_import_process_messages.h

 // 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.
 
 // Multiply-included message file, no traditonal include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 355 matching lines @@
 
 }  // namespace IPC
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_
 
 #define IPC_MESSAGE_START ProfileImportMsgStart
 
 //-----------------------------------------------------------------------------
 // ProfileImportProcess messages
 // These are messages sent from the browser to the profile import process.
-IPC_MESSAGE_CONTROL4(ProfileImportProcessMsg_StartImport,
+IPC_MESSAGE_CONTROL3(ProfileImportProcessMsg_StartImport,
                      importer::SourceProfile,
                      int                     /* Bitmask of items to import. */,
-                     DictionaryValue         /* Localized strings. */,
-                     bool                    /* Import to bookmark bar. */)
+                     DictionaryValue         /* Localized strings. */)
 
 IPC_MESSAGE_CONTROL0(ProfileImportProcessMsg_CancelImport)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessMsg_ReportImportItemFinished,
                      int  /* ImportItem */)
 
 //---------------------------------------------------------------------------
 // ProfileImportProcessHost messages
 // These are messages sent from the profile import process to the browser.
 // These messages send information about the status of the import and
@@ skipping 16 matching lines @@
                      int  /* total number of history::URLRow items */)
 
 IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyHistoryImportGroup,
                      std::vector<history::URLRow>,
                      int  /* the source of URLs as in history::VisitSource.*/
                           /* To simplify IPC call, pass as an integer */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyHomePageImportReady,
                      GURL  /* GURL of home page */)
 
-IPC_MESSAGE_CONTROL3(ProfileImportProcessHostMsg_NotifyBookmarksImportStart,
+IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyBookmarksImportStart,
                      string16  /* first folder name */,
-                     int       /* options */,
                      int       /* total number of bookmarks */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyBookmarksImportGroup,
                      std::vector<ProfileWriter::BookmarkEntry>)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportStart,
                      int  /* total number of favicons */)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFaviconsImportGroup,
                      std::vector<history::ImportedFaviconUsage>)
 
 IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
                      webkit_glue::PasswordForm)
 
 IPC_MESSAGE_CONTROL3(ProfileImportProcessHostMsg_NotifyKeywordsReady,
                      std::vector<TemplateURL>,
                      int,  /* default keyword index */
                      bool  /* unique on host and path */)