| Index: chrome/utility/importer/bookmark_html_reader_unittest.cc
|
| diff --git a/chrome/utility/importer/bookmark_html_reader_unittest.cc b/chrome/utility/importer/bookmark_html_reader_unittest.cc
|
| index 47ae53e7fbe1ea1aa54f0bf0d2643c2d66aeba6b..9cbb98391141e3e2e52492160ffe36b3223154d9 100644
|
| --- a/chrome/utility/importer/bookmark_html_reader_unittest.cc
|
| +++ b/chrome/utility/importer/bookmark_html_reader_unittest.cc
|
| @@ -244,7 +244,7 @@ TEST_F(BookmarkHTMLReaderTestWithData, Firefox2BookmarkFileImport) {
|
| 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]);
|
| @@ -258,7 +258,7 @@ TEST_F(BookmarkHTMLReaderTestWithData, BookmarkFileWithHrTagImport) {
|
| 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]);
|
| @@ -272,7 +272,7 @@ TEST_F(BookmarkHTMLReaderTestWithData, EpiphanyBookmarkFileImport) {
|
| 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]);
|
| @@ -301,7 +301,7 @@ TEST_F(BookmarkHTMLReaderTestWithData, CancellationCallback) {
|
| 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
|
| @@ -326,7 +326,7 @@ TEST_F(BookmarkHTMLReaderTestWithData, ValidURLCallback) {
|
| 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]);
|
|
|