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

chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

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..63d54bbe80aebfbc2bd6a36d6681a04125bac8de 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
+#include "chrome/common/importer/importer_data_types.h"

[Ilya Sherman, 2014/11/07 00:22:34]

nit: The presubmit warning was warning you that this line is not alphabetized
correctly.

[Tapu Ghose, 2014/11/09 14:03:06]

Done.

 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/utility/importer/bookmark_html_reader.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 engine.

[Ilya Sherman, 2014/11/07 00:22:34]

nit: "no search engine" -> "no search engines"

[Tapu Ghose, 2014/11/09 14:03:06]

Done.

+  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.