Many fixes to bookmark importing.

chrome/browser/importer/firefox2_importer.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_FIREFOX2_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 28 matching lines @@
   static TemplateURL* CreateTemplateURL(const string16& title,
                                         const string16& keyword,
                                         const GURL& url);
 
   // Imports the bookmarks from the specified file. |template_urls| and
   // |favicons| may be null, in which case TemplateURLs and favicons are
   // not parsed. Any bookmarks in |default_urls| are ignored.
   static void ImportBookmarksFile(
       const FilePath& file_path,
       const std::set<GURL>& default_urls,
-      bool import_to_bookmark_bar,
-      const string16& first_folder_name,
       Importer* importer,
       std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
       std::vector<TemplateURL*>* template_urls,
       std::vector<history::ImportedFaviconUsage>* favicons);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2BookmarkParse);
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2CookesParse);
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2BookmarkFileImport);
 
@@ skipping 79 matching lines @@
 
   FilePath source_path_;
   FilePath app_path_;
   // If true, we only parse the bookmarks.html file specified as source_path_.
   bool parsing_bookmarks_html_file_;
 
   DISALLOW_COPY_AND_ASSIGN(Firefox2Importer);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_FIREFOX2_IMPORTER_H_