Many fixes to bookmark importing.

chrome/browser/importer/profile_import_process_messages.h

Index: chrome/browser/importer/profile_import_process_messages.h
diff --git a/chrome/browser/importer/profile_import_process_messages.h b/chrome/browser/importer/profile_import_process_messages.h
index 1fbf73d5ed1be8932dca43d7896b41cf66168706..d7d90485c8a83bae05fc3904bf8fcca29c98a677 100644
--- a/chrome/browser/importer/profile_import_process_messages.h
+++ b/chrome/browser/importer/profile_import_process_messages.h
@@ -373,11 +373,10 @@ struct ParamTraits<TemplateURL> {
 //-----------------------------------------------------------------------------
 // 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)
 
@@ -414,9 +413,8 @@ IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyHistoryImportGroup,
 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,