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

chrome/utility/importer/bookmark_html_reader.h

Index: chrome/utility/importer/bookmark_html_reader.h
diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
index 274c9a272169ee622e9b8f1c64d395e3764ab045..452dc32939b524b410c1a34b0263a261eb989346 100644
--- a/chrome/utility/importer/bookmark_html_reader.h
+++ b/chrome/utility/importer/bookmark_html_reader.h
@@ -10,6 +10,7 @@
 
 #include "base/callback_forward.h"
 #include "base/strings/string16.h"
+#include "chrome/common/importer/importer_data_types.h"
 
 class GURL;
 struct ImportedBookmarkEntry;
@@ -37,6 +38,9 @@ namespace bookmark_html_reader {
 // |bookmarks| is a pointer to a vector, which is filled with the imported
 // bookmarks. It may not be NULL.
 //
+// |url_keywords| is a pointer toa vector, which is filled with the imported

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

nit: "toa" -> "to a"

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

Done.

+// keywords that will be imported as search engines.
+//
 // |favicons| is a pointer to a vector, which is filled with the favicons of
 // imported bookmarks. It may be NULL, in which case favicons are not imported.
 void ImportBookmarksFile(
@@ -44,8 +48,16 @@ void ImportBookmarksFile(
     const base::Callback<bool(const GURL&)>& valid_url_callback,
     const base::FilePath& file_path,
     std::vector<ImportedBookmarkEntry>* bookmarks,
+    std::vector<importer::URLKeywordInfo>* url_keywords,

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

"URL keyword" seems like a rather confusing name.  Why not call the type and
variable here something about "template URLs" or "search engines"?

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

Renaming the variable to search_engine_keywords which will passed to
InProcessImporterBridge::SetKeywords(...) as parameter.

     std::vector<ImportedFaviconUsage>* favicons);
 
+// Checks if a bookmark that contains invalid |url| can be imported as search
+// engine. Scan |url| to check if there is any replacement term, %s. If yes then

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

Nit: Scan -> scans, substitute -> substitutes.

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

Done.

+// substitute the replacement term(s) with any arbitrary value. Returns true if

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

What does "with any arbitrary value" mean?  Surely it uses some particular
value.  Did you mean "an" instead of "any"?

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

I meant "an" here.

+// the resulted url is a valid one.

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

nit: "resulted" -> "resulting"

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

Done.

+// |decoded_url| holds decoded raw url of |url|.
+bool CanImportURLAsSearchEngine(const GURL& url, base::string16* decoded_url);
+
 namespace internal {
 
 // The file format that BookmarkHTMLReader parses starts with a heading