Many fixes to bookmark importing.

chrome/browser/importer/profile_import_process_client.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_client.h"
 
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/profile_import_process_host.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 32 matching lines @@
 void ProfileImportProcessClient::OnHistoryImportGroup(
     const std::vector<history::URLRow>& history_rows_group,
     int visit_source) {
 }
 
 void ProfileImportProcessClient::OnHomePageImportReady(const GURL& home_page) {
 }
 
 void ProfileImportProcessClient::OnBookmarksImportStart(
     const string16& first_folder_name,
-    int options,
     size_t total_bookmarks_count) {
 }
 
 void ProfileImportProcessClient::OnBookmarksImportGroup(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
 }
 
 void ProfileImportProcessClient::OnFaviconsImportStart(
     size_t total_favicons_count) {
 }
@@ skipping 45 matching lines @@
                         OnPasswordFormImportReady)
     IPC_MESSAGE_HANDLER(ProfileImportProcessHostMsg_NotifyKeywordsReady,
                         OnKeywordsImportReady)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 ProfileImportProcessClient::~ProfileImportProcessClient() {
 }