Many fixes to bookmark importing.

chrome/browser/importer/in_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_IN_PROCESS_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IN_PROCESS_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/profile_writer.h"
 
 class GURL;
 class ImporterHost;
 
 class InProcessImporterBridge : public ImporterBridge {
  public:
   InProcessImporterBridge(ProfileWriter* writer, ImporterHost* host);
 
   // 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 18 matching lines @@
  private:
   virtual ~InProcessImporterBridge();
 
   ProfileWriter* const writer_;  // weak
   ImporterHost* const host_;     // weak
 
   DISALLOW_COPY_AND_ASSIGN(InProcessImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IN_PROCESS_IMPORTER_BRIDGE_H_