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 2afa621e19b34316b9cceb8ac5560bafec424b26..0778e2c645a0e50dac31843b0496adbbbb7791e5 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"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/utility/importer/bookmark_html_reader.h"
@@ -242,11 +243,13 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
 
   // Read the bookmarks back in.
   std::vector<ImportedBookmarkEntry> parsed_bookmarks;
+  std::vector<importer::URLKeywordInfo> parsed_url_keywords;

[Peter Kasting, 2014/10/07 23:17:38]

Nit: parsed_search_engines?

[Tapu Ghose, 2014/10/12 00:58:20]

Done.

   std::vector<ImportedFaviconUsage> favicons;
   bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
                                             base::Callback<bool(const GURL&)>(),
                                             path_,
                                             &parsed_bookmarks,
+                                            &parsed_url_keywords,

[Peter Kasting, 2014/10/07 23:17:38]

Should we at least be testing that this is empty?  Should there be any other
tests of this in this file?

[Tapu Ghose, 2014/10/12 00:58:20]

Since there is no entry in the BookmarkModel that can be imported as search
engine, code added to verify that parsed_url_keywords is empty.

An entry could have been made to BookmarkModel such that it can be imported as
search engine. And appropriate test could have been added. But similar test is
attempted in /chrome/utility/importer/bookmark_html_reader_unittest.cc.

                                             &favicons);
 
   // Check loaded favicon (url1 is represented by 4 separate bookmarks).