Many fixes to bookmark importing.

chrome/browser/importer/profile_import_process_client.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.
 
 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_CLIENT_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_CLIENT_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 39 matching lines @@
   // These methods pass back data to be written to the user's profile from
   // the external process to the process host client.
   virtual void OnHistoryImportStart(size_t total_history_rows_count);
   virtual void OnHistoryImportGroup(
       const std::vector<history::URLRow>& history_rows_group,
       int visit_source); // visit_source has history::VisitSource type.
 
   virtual void OnHomePageImportReady(const GURL& home_page);
 
   virtual void OnBookmarksImportStart(const string16& first_folder_name,
-                                      int options,
                                       size_t total_bookmarks_count);
   virtual void OnBookmarksImportGroup(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks);
 
   virtual void OnFaviconsImportStart(size_t total_favicons_count);
   virtual void OnFaviconsImportGroup(
       const std::vector<history::ImportedFaviconUsage>& favicons_group);
 
   virtual void OnPasswordFormImportReady(
       const webkit_glue::PasswordForm& form);
@@ skipping 10 matching lines @@
 
   virtual ~ProfileImportProcessClient();
 
  private:
   friend class ProfileImportProcessHost;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImportProcessClient);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_CLIENT_H_