Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/importer/safari_importer_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/safari_importer.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/history/history_types.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
+#include "chrome/browser/favicon/imported_favicon_usage.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
 #include "sql/connection.h"
 #include "testing/platform_test.h"
 
 // In order to test the Safari import functionality effectively, we store a
 // simulated Library directory containing dummy data files in the same
 // structure as ~/Library in the Chrome test data directory.
 // This function returns the path to that directory.
 base::FilePath GetTestSafariLibraryPath() {
@@ skipping 93 matching lines @@
     },
     {
       false,
       GURL("http://www.webkit.org/blog/"),
       string16(),
       ASCIIToUTF16("Surfin' Safari - The WebKit Blog")
     },
   };
 
   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);
 
     std::vector<string16> path;
     Tokenize(kImportedBookmarksData[i].path, ASCIIToUTF16("/"), &path);
     ASSERT_EQ(path.size(), entry.path.size());
     for (size_t j = 0; j < path.size(); ++j) {
       EXPECT_EQ(path[j], entry.path[j]);
     }
 
     EXPECT_EQ(kImportedBookmarksData[i].title, entry.title);
   }
 }
 
 TEST_F(SafariImporterTest, FaviconImport) {
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
   sql::Connection db;
   ASSERT_TRUE(importer->OpenDatabase(&db));
 
   SafariImporter::FaviconMap favicon_map;
   importer->ImportFaviconURLs(&db, &favicon_map);
 
-  std::vector<history::ImportedFaviconUsage> favicons;
+  std::vector<ImportedFaviconUsage> favicons;
   importer->LoadFaviconData(&db, favicon_map, &favicons);
 
   size_t num_favicons = favicons.size();
   ASSERT_EQ(num_favicons, 2U);
 
-  history::ImportedFaviconUsage &fav0 = favicons[0];
+  ImportedFaviconUsage &fav0 = favicons[0];
   EXPECT_EQ("http://s.ytimg.com/yt/favicon-vfl86270.ico",
             fav0.favicon_url.spec());
   EXPECT_GT(fav0.png_data.size(), 0U);
   EXPECT_EQ(fav0.urls.size(), 1U);
   EXPECT_TRUE(fav0.urls.find(GURL("http://www.youtube.com/"))
       != fav0.urls.end());
 
-  history::ImportedFaviconUsage &fav1 = favicons[1];
+  ImportedFaviconUsage &fav1 = favicons[1];
   EXPECT_EQ("http://www.opensearch.org/favicon.ico",
             fav1.favicon_url.spec());
   EXPECT_GT(fav1.png_data.size(), 0U);
   EXPECT_EQ(fav1.urls.size(), 2U);
   EXPECT_TRUE(fav1.urls.find(GURL("http://www.opensearch.org/Home"))
       != fav1.urls.end());
 
   EXPECT_TRUE(fav1.urls.find(
       GURL("http://www.opensearch.org/Special:Search?search=lalala&go=Search"))
           != fav1.urls.end());
 }
 
 TEST_F(SafariImporterTest, CanImport) {
   uint16 items = importer::NONE;
   EXPECT_TRUE(SafariImporter::CanImport(GetTestSafariLibraryPath(), &items));
   EXPECT_EQ(items, importer::HISTORY | importer::FAVORITES);
   EXPECT_EQ(items & importer::COOKIES, importer::NONE);
   EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
   EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);
   EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
 
   // Check that we don't import anything from a bogus library directory.
   base::ScopedTempDir fake_library_dir;
   ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
   EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir.path(), &items));
 }