Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

Issue 616763002: Importing certain bookmarks from firefox and HTML file as search engines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handled potential NULL pointer exception that could have resulted from CreateTemplateURL. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 9ad9c49726df4a81a0aebb5f2876e09b23850681..a7fca196098a84d0a1ad489613abae7007a78d90 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/common/importer/imported_favicon_usage.h"
+#include "chrome/common/importer/importer_data_types.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/utility/importer/bookmark_html_reader.h"
#include "components/bookmarks/browser/bookmark_model.h"
@@ -240,11 +241,13 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
// Read the bookmarks back in.
std::vector<ImportedBookmarkEntry> parsed_bookmarks;
+ std::vector<importer::SearchEngineInfo> parsed_search_engines;
std::vector<ImportedFaviconUsage> favicons;
bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
base::Callback<bool(const GURL&)>(),
path_,
&parsed_bookmarks,
+ &parsed_search_engines,
&favicons);
// Check loaded favicon (url1 is represented by 4 separate bookmarks).
@@ -259,6 +262,10 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
}
}
+ // Since we did not populate the BookmarkModel with any entry which can be
+ // imported as search engine, verify that we got back no search engines.
+ ASSERT_EQ(0U, parsed_search_engines.size());
+
// Verify we got back what we wrote.
ASSERT_EQ(9U, parsed_bookmarks.size());
// Windows and ChromeOS builds use Sentence case.

Powered by Google App Engine
This is Rietveld 408576698