Many fixes to bookmark importing.

chrome/browser/importer/external_process_importer_bridge.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_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 13 matching lines @@
 // internal bridge gathers the data from the IPC host and writes it to the
 // profile.
 class ExternalProcessImporterBridge : public ImporterBridge {
  public:
   ExternalProcessImporterBridge(ProfileImportThread* profile_import_thread,
                                 const DictionaryValue& localized_strings);
 
   // Begin ImporterBridge implementation:
   virtual void AddBookmarks(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-      const string16& first_folder_name,
-      int options) OVERRIDE;
+      const string16& first_folder_name) OVERRIDE;
 
   virtual void AddHomePage(const GURL& home_page) OVERRIDE;
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(
       const IE7PasswordInfo& password_info) OVERRIDE;
 #endif
 
   virtual void SetFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicons) OVERRIDE;
@@ skipping 22 matching lines @@
   ProfileImportThread* const profile_import_thread_;
 
   // Holds strings needed by the external importer because the resource
   // bundle isn't available to the external process.
   scoped_ptr<DictionaryValue> localized_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_