Many fixes to bookmark importing.

chrome/browser/importer/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_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
 
 // TODO: remove this, see friend declaration in ImporterBridge.
 class Toolbar5Importer;
 
 class ImporterBridge : public base::RefCountedThreadSafe<ImporterBridge> {
  public:
   ImporterBridge();
 
   virtual void AddBookmarks(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-      const string16& first_folder_name,
-      int options) = 0;
+      const string16& first_folder_name) = 0;
 
   virtual void AddHomePage(const GURL& home_page) = 0;
 
 #if defined(OS_WIN)
   virtual void AddIE7PasswordInfo(const IE7PasswordInfo& password_info) = 0;
 #endif
 
   virtual void SetFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicons) = 0;
 
@@ skipping 32 matching lines @@
   // connection, but as an interim step we allow Toolbar5Import to break
   // the abstraction here and assume import is in-process.
   friend class Toolbar5Importer;
 
   virtual ~ImporterBridge();
 
   DISALLOW_COPY_AND_ASSIGN(ImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_