Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/ie_importer.cc

Index: chrome/browser/importer/ie_importer.cc
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index bfcfd0164ddd9d344c3633e71059addf40c761a4..c8fe52f2064045f9652bf2ffd758ad97bd1fd242 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -28,6 +28,7 @@
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_util.h"
@@ -117,8 +118,8 @@ LPCITEMIDLIST BinaryReadItemIDList(size_t offset, size_t idlist_size,
 // Compares the two bookmarks in the order of IE's Favorites menu.
 // Returns true if rhs should come later than lhs (lhs < rhs).
 struct IEOrderBookmarkComparator {
-  bool operator()(const ProfileWriter::BookmarkEntry& lhs,
-                  const ProfileWriter::BookmarkEntry& rhs) const {
+  bool operator()(const ImportedBookmarkEntry& lhs,
+                  const ImportedBookmarkEntry& rhs) const {
     static const uint32 kNotSorted = 0xfffffffb; // IE uses this magic value.
     base::FilePath lhs_prefix;
     base::FilePath rhs_prefix;
@@ -261,7 +262,7 @@ bool ParseFavoritesOrderInfo(
 // and use the default (alphabetical) order.
 void SortBookmarksInIEOrder(
     const Importer* importer,
-    std::vector<ProfileWriter::BookmarkEntry>* bookmarks) {
+    std::vector<ImportedBookmarkEntry>* bookmarks) {
   std::map<base::FilePath, uint32> sort_index;
   if (!ParseFavoritesOrderInfo(importer, &sort_index))
     return;
@@ -863,7 +864,7 @@ void IEImporter::ParseFavoritesFolder(
       relative_string = relative_string.substr(1);
     base::FilePath relative_path(relative_string);
 
-    ProfileWriter::BookmarkEntry entry;
+    ImportedBookmarkEntry entry;
     // Remove the dot, the file extension, and the directory path.
     entry.title = shortcut.RemoveExtension().BaseName().value();
     entry.url = url;