Extract BookmarksFileImporter from Firefox2Importer.

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

 // 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/bookmarks/bookmark_html_writer.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/bookmark_html_reader.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
+#include "chrome/browser/favicon/imported_favicon_usage.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
 using content::BrowserThread;
@@ skipping 16 matching lines @@
 }  // namespace
 
 class BookmarkHTMLWriterTest : public testing::Test {
  protected:
   virtual void SetUp() {
     testing::Test::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     path_ = temp_dir_.path().AppendASCII("bookmarks.html");
   }
 
-  // Converts a BookmarkEntry to a string suitable for assertion testing.
-  string16 BookmarkEntryToString(const ProfileWriter::BookmarkEntry& entry) {
+  // Converts an ImportedBookmarkEntry to a string suitable for assertion
+  // testing.
+  string16 BookmarkEntryToString(const ImportedBookmarkEntry& entry) {
     string16 result;
     result.append(ASCIIToUTF16("on_toolbar="));
     if (entry.in_toolbar)
       result.append(ASCIIToUTF16("true"));
     else
       result.append(ASCIIToUTF16("false"));
 
     result.append(ASCIIToUTF16(" url=") + UTF8ToUTF16(entry.url.spec()));
 
     result.append(ASCIIToUTF16(" path="));
@@ skipping 12 matching lines @@
   }
 
   // Creates a set of bookmark values to a string for assertion testing.
   string16 BookmarkValuesToString(bool on_toolbar,
                                   const GURL& url,
                                   const string16& title,
                                   base::Time creation_time,
                                   const string16& f1,
                                   const string16& f2,
                                   const string16& f3) {
-    ProfileWriter::BookmarkEntry entry;
+    ImportedBookmarkEntry entry;
     entry.in_toolbar = on_toolbar;
     entry.url = url;
     if (!f1.empty()) {
       entry.path.push_back(f1);
       if (!f2.empty()) {
         entry.path.push_back(f2);
         if (!f3.empty())
           entry.path.push_back(f3);
       }
     }
     entry.title = title;
     entry.creation_time = creation_time;
     return BookmarkEntryToString(entry);
   }
 
-  void AssertBookmarkEntryEquals(const ProfileWriter::BookmarkEntry& entry,
+  void AssertBookmarkEntryEquals(const ImportedBookmarkEntry& entry,
                                  bool on_toolbar,
                                  const GURL& url,
                                  const string16& title,
                                  base::Time creation_time,
                                  const string16& f1,
                                  const string16& f2,
                                  const string16& f3) {
     EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time,
                                      f1, f2, f3),
               BookmarkEntryToString(entry));
@@ skipping 51 matching lines @@
   //   url3
   //   url4
   // Other
   //   url1
   //   url2
   //   F3
   //     F4
   //       url1
   // Mobile
   //   url1
-  //   <bookmark without a title.  Not supported by Firefox 2 import>
+  //   <bookmark without a title.>
   string16 f1_title = ASCIIToUTF16("F\"&;<1\"");
   string16 f2_title = ASCIIToUTF16("F2");
   string16 f3_title = ASCIIToUTF16("F 3");
   string16 f4_title = ASCIIToUTF16("F4");
   string16 url1_title = ASCIIToUTF16("url 1");
   string16 url2_title = ASCIIToUTF16("url&2");
   string16 url3_title = ASCIIToUTF16("url\"3");
   string16 url4_title = ASCIIToUTF16("url\"&;");
   string16 unnamed_bookmark_title = ASCIIToUTF16("");
   GURL url1("http://url1");
@@ skipping 37 matching lines @@
   bookmark_html_writer::WriteBookmarks(&profile, path_, &observer);
   message_loop.Run();
 
   // Clear favicon so that it would be read from file.
   FaviconServiceFactory::GetForProfile(
       &profile, Profile::EXPLICIT_ACCESS)->SetFavicons(
           url1, url1_favicon, history::FAVICON, gfx::Image());
   message_loop.RunUntilIdle();
 
   // Read the bookmarks back in.
-  std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks;
-  std::vector<history::ImportedFaviconUsage> favicons;
-  Firefox2Importer::ImportBookmarksFile(path_,
-                                        std::set<GURL>(),
-                                        NULL,
-                                        &parsed_bookmarks,
-                                        NULL,
-                                        &favicons);
+  std::vector<ImportedBookmarkEntry> parsed_bookmarks;
+  std::vector<ImportedFaviconUsage> favicons;
+  bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
+                                            base::Callback<bool(const GURL&)>(),
+                                            path_,
+                                            &parsed_bookmarks,
+                                            &favicons);
 
   // Check loaded favicon (url1 is represented by 4 separate bookmarks).
   EXPECT_EQ(4U, favicons.size());
   for (size_t i = 0; i < favicons.size(); i++) {
     if (url1_favicon == favicons[i].favicon_url) {
       EXPECT_EQ(1U, favicons[i].urls.size());
       std::set<GURL>::const_iterator iter = favicons[i].urls.find(url1);
       ASSERT_TRUE(iter != favicons[i].urls.end());
       ASSERT_TRUE(*iter == url1);
       ASSERT_TRUE(favicons[i].png_data == icon_data);
     }
   }
 
   // Verify we got back what we wrote.
-  ASSERT_EQ(8U, parsed_bookmarks.size());
+  ASSERT_EQ(9U, parsed_bookmarks.size());
   // Windows and ChromeOS builds use Sentence case.
   string16 bookmark_folder_name =
       l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME);
   AssertBookmarkEntryEquals(parsed_bookmarks[0], true, url1, url1_title, t1,
                             bookmark_folder_name, f1_title, string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[1], true, url2, url2_title, t2,
                             bookmark_folder_name, f1_title, f2_title);
   AssertBookmarkEntryEquals(parsed_bookmarks[2], true, url3, url3_title, t3,
                             bookmark_folder_name, string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[3], true, url4, url4_title, t4,
                             bookmark_folder_name, string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,
                             string16(), string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,
                             string16(), string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
                             f3_title, f4_title, string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1,
                             string16(), string16(), string16());
+  AssertBookmarkEntryEquals(parsed_bookmarks[8], false, unnamed_bookmark_url,
+                            unnamed_bookmark_title, t2,
+                            string16(), string16(), string16());
 }