Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/firefox2_importer.cc

Index: chrome/browser/importer/firefox2_importer.cc
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index 9d70c538dde1e761a253976af7e346dac24fb839..09a8097f57502ba1d844719b59e363a9ea431441 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -17,6 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_bridge.h"
@@ -148,7 +149,7 @@ void Firefox2Importer::ImportBookmarksFile(
     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::string content;
@@ -205,7 +206,7 @@ void Firefox2Importer::ImportBookmarksFile(
         break;
       }
 
-      ProfileWriter::BookmarkEntry entry;
+      ImportedBookmarkEntry entry;
       entry.creation_time = add_date;
       entry.url = url;
       entry.title = title;
@@ -261,7 +262,7 @@ void Firefox2Importer::ImportBookmarksFile(
 
       if (last_folder_is_empty) {
         // Empty folder should be added explicitly.
-        ProfileWriter::BookmarkEntry entry;
+        ImportedBookmarkEntry entry;
         entry.is_folder = true;
         entry.creation_time = last_folder_add_date;
         entry.title = folder_title;
@@ -296,7 +297,7 @@ void Firefox2Importer::ImportBookmarks() {
     LoadDefaultBookmarks(app_path_, &default_urls);
 
   // Parse the bookmarks.html file.
-  std::vector<ProfileWriter::BookmarkEntry> bookmarks, toolbar_bookmarks;
+  std::vector<ImportedBookmarkEntry> bookmarks, toolbar_bookmarks;
   std::vector<TemplateURL*> template_urls;
   std::vector<history::ImportedFaviconUsage> favicons;
   base::FilePath file = source_path_;