Importing certain bookmarks from firefox and HTML file as search engines.

chrome/utility/importer/bookmark_html_reader_unittest.cc

 // Copyright 2013 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/utility/importer/bookmark_html_reader.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 226 matching lines @@
 }
 
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, Firefox2BookmarkFileImport) {
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(3U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
   ExpectSecondFirefox2Bookmark(bookmarks[1]);
   ExpectThirdFirefox2Bookmark(bookmarks[2]);
 }
 
 TEST_F(BookmarkHTMLReaderTestWithData, BookmarkFileWithHrTagImport) {
   base::FilePath path = test_data_path_.AppendASCII("firefox23.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(3U, bookmarks.size());
   ExpectFirstFirefox23Bookmark(bookmarks[0]);
   ExpectSecondFirefox23Bookmark(bookmarks[1]);
   ExpectThirdFirefox23Bookmark(bookmarks[2]);
 }
 
 TEST_F(BookmarkHTMLReaderTestWithData, EpiphanyBookmarkFileImport) {
   base::FilePath path = test_data_path_.AppendASCII("epiphany.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(2U, bookmarks.size());
   ExpectFirstEpiphanyBookmark(bookmarks[0]);
   ExpectSecondEpiphanyBookmark(bookmarks[1]);
 }
 
 namespace {
 
 class CancelAfterFifteenCalls {
   int count;
  public:
   CancelAfterFifteenCalls() : count(0) { }
   bool ShouldCancel() {
     return ++count > 16;
   }
 };
 
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, CancellationCallback) {
   // Use a file for testing that has multiple bookmarks.
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   CancelAfterFifteenCalls cancel_fifteen;
   ImportBookmarksFile(base::Bind(&CancelAfterFifteenCalls::ShouldCancel,
                                  base::Unretained(&cancel_fifteen)),
                       base::Callback<bool(const GURL&)>(),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   // The cancellation callback is checked before each line is read, so fifteen
   // lines are imported. The first fifteen lines of firefox2.html include only
   // one bookmark.
   ASSERT_EQ(1U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
 }
 
 namespace {
 
 bool IsURLValid(const GURL& url) {
   // No offense to whomever owns this domain...
   return !url.DomainIs("tamurayukari.com");
 }
 
 }  // namespace
 
 TEST_F(BookmarkHTMLReaderTestWithData, ValidURLCallback) {
   // Use a file for testing that has multiple bookmarks.
   base::FilePath path = test_data_path_.AppendASCII("firefox2.html");
 
   std::vector<ImportedBookmarkEntry> bookmarks;
   ImportBookmarksFile(base::Callback<bool(void)>(),
                       base::Bind(&IsURLValid),
-                      path, &bookmarks, NULL);
+                      path, &bookmarks, NULL, NULL);
 
   ASSERT_EQ(2U, bookmarks.size());
   ExpectFirstFirefox2Bookmark(bookmarks[0]);
   ExpectThirdFirefox2Bookmark(bookmarks[1]);
 }
 
 }  // namespace bookmark_html_reader

[Ilya Sherman, 2014/09/30 20:54:12]

Please add test coverage for your changes.

[Tapu Ghose, 2014/10/07 02:02:44]

Done.