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

chrome/utility/importer/firefox_importer.cc

Index: chrome/utility/importer/firefox_importer.cc
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index 6444e29bdfb56afd07e74d0355f568520ab095b5..0ccc34e5ebebb023a8f859e2a70bed99c36a5396 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -51,10 +51,12 @@ void LoadDefaultBookmarks(const base::FilePath& app_path,
   urls->clear();
 
   std::vector<ImportedBookmarkEntry> bookmarks;
+  std::vector<importer::URLKeywordInfo> url_keywords;
   bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
                                             base::Callback<bool(const GURL&)>(),
                                             file,
                                             &bookmarks,
+                                            &url_keywords,
                                             NULL);
   for (size_t i = 0; i < bookmarks.size(); ++i)
     urls->insert(bookmarks[i].url);
@@ -252,9 +254,19 @@ void FirefoxImporter::ImportBookmarks() {
       if (!item->empty_folder)
         continue;
     } else if (item->type == TYPE_BOOKMARK) {
-      // Import only valid bookmarks
-      if (!CanImportURL(item->url))
+      // Import only valid bookmarks.
+      if (!CanImportURL(item->url)) {
+        importer::URLKeywordInfo search_engine_info;
+        // Import invalid bookmark's keyword as search engine.

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

This comment sounds unconditional, which isn't true of the code.

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

Acknowledged.

+        if (!item->keyword.empty() &&
+            bookmark_html_reader::CanImportURLAsSearchEngine(item->url,
+                base::UTF8ToUTF16(item->keyword),
+                item->title,
+                &search_engine_info)) {
+          url_keywords.push_back(search_engine_info);
+        }
         continue;
+      }
     } else {
       continue;
     }
@@ -316,7 +328,7 @@ void FirefoxImporter::ImportBookmarks() {
       // This bookmark has a keyword, we should import it.
       if (!item->keyword.empty() && item->url.is_valid()) {
         importer::URLKeywordInfo url_keyword_info;
-        url_keyword_info.url = item->url;
+        url_keyword_info.raw_url.assign(base::UTF8ToUTF16(item->url.spec()));
         url_keyword_info.keyword.assign(base::UTF8ToUTF16(item->keyword));
         url_keyword_info.display_name = item->title;
         url_keywords.push_back(url_keyword_info);