Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/safari_importer_unittest.mm

Index: chrome/browser/importer/safari_importer_unittest.mm
diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm
index 752e92cb84f0be5203eeca1652356e3d62a2a5f2..633c6ae64ca388ca2372c819f2a5c610beeed9dd 100644
--- a/chrome/browser/importer/safari_importer_unittest.mm
+++ b/chrome/browser/importer/safari_importer_unittest.mm
@@ -13,6 +13,7 @@
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.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/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
@@ -127,13 +128,13 @@ TEST_F(SafariImporterTest, BookmarkImport) {
   };
 
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
-  std::vector<ProfileWriter::BookmarkEntry> bookmarks;
+  std::vector<ImportedBookmarkEntry> bookmarks;
   importer->ParseBookmarks(ASCIIToUTF16("Toolbar"), &bookmarks);
   size_t num_bookmarks = bookmarks.size();
   ASSERT_EQ(ARRAYSIZE_UNSAFE(kImportedBookmarksData), num_bookmarks);
 
   for (size_t i = 0; i < num_bookmarks; ++i) {
-    ProfileWriter::BookmarkEntry& entry = bookmarks[i];
+    ImportedBookmarkEntry& entry = bookmarks[i];
     EXPECT_EQ(kImportedBookmarksData[i].in_toolbar, entry.in_toolbar);
     EXPECT_EQ(kImportedBookmarksData[i].url, entry.url);