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

chrome/utility/importer/firefox_importer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/importer/firefox_importer.h"
 
 #include <set>
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
@@ skipping 33 matching lines @@
 // Loads the default bookmarks in the Firefox installed at |app_path|,
 // and stores their locations in |urls|.
 void LoadDefaultBookmarks(const base::FilePath& app_path,
                           std::set<GURL>* urls) {
   base::FilePath file = app_path.AppendASCII("defaults")
       .AppendASCII("profile")
       .AppendASCII("bookmarks.html");
   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);
 }
 
 // Returns true if |url| has a valid scheme that we allow to import. We
 // filter out the URL with a unsupported scheme.
 bool CanImportURL(const GURL& url) {
   // The URL is not valid.
   if (!url.is_valid())
@@ skipping 177 matching lines @@
 
   for (size_t i = 0; i < list.size(); ++i) {
     BookmarkItem* item = list[i];
 
     if (item->type == TYPE_FOLDER) {
       // Folders are added implicitly on adding children, so we only explicitly
       // add empty folders.
       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)) {
+        base::string16 decoded_url;
+        // Import invalid bookmark's keyword as search engine.

[Peter Kasting, 2014/10/01 01:02:55]

How is the functionality from this file different than in
bookmark_html_reader.cc:ImportBookmarksFile()?  Why do we have this code twice? 
We should only have one implementation of this sort of thing.

[Tapu Ghose, 2014/10/07 02:02:45]

I agree.

+        if (!item->keyword.empty() &&
+            bookmark_html_reader::CanImportURLAsSearchEngine(item->url,
+                                                             &decoded_url)) {
+          importer::URLKeywordInfo url_keyword_info;
+          // Since |item->url| is invalid, set raw_url property of
+          // |url_keyword_info| which will be used in importing as search
+          // engine.
+          url_keyword_info.raw_url = decoded_url;
+          url_keyword_info.keyword.assign(base::UTF8ToUTF16(item->keyword));
+          url_keyword_info.display_name = item->title;
+          url_keywords.push_back(url_keyword_info);
+        }

[Ilya Sherman, 2014/09/30 20:54:13]

Please add test coverage for these changes

[Tapu Ghose, 2014/10/07 02:02:45]

Added a new bookmark entry into places.sql files placed in firefox profile
directories under /chrome/test/data/ directory:

1) url: http://example.%s.com/
2) keyword: keyword
3) Title: Bookmark Keyword.

P.S.: If I recall correctly, earlier we had issue in passing browser tests due
to some updated binary files. As a work around I had to email you those files.
Please let me know if you want me to send place.sql files via email/attachment.

[Ilya Sherman, 2014/10/07 22:08:22]

Let's get this CL fully sorted out, with all tests passing for you locally.  At
that point, if the CQ won't accept the binary files as part of your CL, I can
land them in a separate CL.

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

Tests passing for me locally.

         continue;
+      }
     } else {
       continue;
     }
 
     // Skip the default bookmarks and unwanted URLs.
     if (default_urls.find(item->url) != default_urls.end() ||
         post_keyword_ids.find(item->id) != post_keyword_ids.end())
       continue;
 
     // Find the bookmark path by tracing their links to parent folders.
@@ skipping 498 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }