Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

Index: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index f99071840713a62c286c84ea3e32468502c1dbae..9883d1de49ffa74368ef88dcb2d23d1fdd1e9d2f 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/importer/firefox2_importer.h"
+#include "chrome/browser/importer/bookmarks_file_importer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/test_browser_thread.h"
@@ -238,12 +238,10 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
   // Read the bookmarks back in.
   std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks;
   std::vector<history::ImportedFaviconUsage> favicons;
-  Firefox2Importer::ImportBookmarksFile(path_,
-                                        std::set<GURL>(),
-                                        NULL,
-                                        &parsed_bookmarks,
-                                        NULL,
-                                        &favicons);
+  BookmarksFileImporter::ImportBookmarksFile(path_,
+                                             NULL,
+                                             &parsed_bookmarks,
+                                             &favicons);
 
   // Check loaded favicon (url1 is represented by 4 separate bookmarks).
   EXPECT_EQ(4U, favicons.size());