Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/firefox2_importer.h

Index: chrome/browser/importer/firefox2_importer.h
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 5beb62608e8488cb0453cf88979170efc8c1310d..08c62000d3aa14d0fb476c6b6a3ddf1a64dee7d4 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -13,11 +13,16 @@
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/importer/profile_writer.h"
 
 class GURL;
+struct ImportedBookmarkEntry;
+struct ImportedFaviconUsage;
 class TemplateURL;
 
+namespace base {
+class Time;
+}
+
 // Importer for Mozilla Firefox 2.
 class Firefox2Importer : public Importer {
  public:
@@ -46,9 +51,9 @@ class Firefox2Importer : public Importer {
       const base::FilePath& file_path,
       const std::set<GURL>& default_urls,
       Importer* importer,
-      std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+      std::vector<ImportedBookmarkEntry>* bookmarks,
       std::vector<TemplateURL*>* template_urls,
-      std::vector<history::ImportedFaviconUsage>* favicons);
+      std::vector<ImportedFaviconUsage>* favicons);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FirefoxImporterTest, Firefox2BookmarkParse);
@@ -133,7 +138,7 @@ class Firefox2Importer : public Importer {
   static void DataURLToFaviconUsage(
       const GURL& link_url,
       const GURL& favicon_data,
-      std::vector<history::ImportedFaviconUsage>* favicons);
+      std::vector<ImportedFaviconUsage>* favicons);
 
   base::FilePath source_path_;
   base::FilePath app_path_;