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

chrome/browser/importer/firefox_importer_browsertest.cc

Index: chrome/browser/importer/firefox_importer_browsertest.cc
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc
index 2bd2af158afd684d7362b4a87beb7c7f06817694..a4158fc982208f960f5ad69a55db9aec612c4e56 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -98,6 +98,10 @@ const KeywordInfo kFirefoxKeywords[] = {
      "http://www.webster.com/cgi-bin/dictionary?va={searchTerms}"},
     // Search keywords.
     {L"\x4E2D\x6587", L"\x4E2D\x6587", "http://www.google.com/"},
+    {L"keyword", L"keyword", "http://example.{searchTerms}.com/"},
+    // CreateTemplateURL will return NULL for the following bookmark.

[Peter Kasting, 2014/12/09 23:10:18]

Nit: Since "CreateTemplateURL" doesn't otherwise appear in this file, a reader
may not know what it refers to.  I would write
"in_process_importer_bridge.cc:CreateTemplateURL()".

[Tapu Ghose, 2014/12/10 04:41:55]

Done.

+    // Consequently, it won't be imported as search engine.

[Peter Kasting, 2014/12/09 23:10:18]

Nit: as -> as a

[Tapu Ghose, 2014/12/10 04:41:55]

Done.

Realized that we may not have any cases that would return NULL from
"CreateTemplateURL". CreateTemplateURL returns NULL in two cases:

1. passing emtpy url
2. invalid url is encountered while autogenerating keyword

Case 1 will never be reached as the condition is already handled by
"url.is_valid()" or "CanImportURLAsSearchEngine".

Case 2 won't be reached as we do not import bookmark if there is no associated
keyword. Hence, no need to autogenerate keyword.

Having said that....I think we can completely eliminate this particular test
case. Removing this test case....Please let me know if you want me to re-add the
test case.

[Peter Kasting, 2014/12/10 17:41:16]

We should probably still have the test, as we don't have any other tests in here
of invalid input URLs.

[Tapu Ghose, 2014/12/11 03:12:21]

Acknowledged.

+    {L"", L"", "http://%x.example.{searchTerms}.com/"},
 };
 
 const AutofillFormDataInfo kFirefoxAutofillEntries[] = {
@@ -135,7 +139,11 @@ class FirefoxObserver : public ProfileWriter,
     EXPECT_EQ(arraysize(kFirefoxBookmarks), bookmark_count_);
     EXPECT_EQ(1U, history_count_);
     EXPECT_EQ(arraysize(kFirefoxPasswords), password_count_);
-    EXPECT_EQ(arraysize(kFirefoxKeywords), keyword_count_);
+    // The following test case from |kFirefoxKeywords| won't be imported:
+    //   "http://%x.example.{searchTerms}.com/"}.
+    // Hence, value of |keyword_count_| should be lower than size of
+    // |kFirefoxKeywords| by 1.
+    EXPECT_EQ(arraysize(kFirefoxKeywords) - 1, keyword_count_);
   }
 
   bool BookmarkModelIsLoaded() const override {