Parsed search.json for importing search engine settings from FireFox.

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 d841c9b770210d897876c4fd488ee24c368931bb..7476f6d588ddea836a21ada7da27eee141ee1a3a 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -67,31 +67,25 @@ const PasswordInfo kFirefoxPasswords[] = {
 };
 
 const KeywordInfo kFirefoxKeywords[] = {
-  { L"amazon.com",
-    "http://www.amazon.com/exec/obidos/external-search/?field-keywords="
-    "{searchTerms}&mode=blended" },
-  { L"answers.com",
-    "http://www.answers.com/main/ntquery?s={searchTerms}&gwp=13" },
-  { L"search.creativecommons.org",
-    "http://search.creativecommons.org/?q={searchTerms}" },
-  { L"search.ebay.com",
-    "http://search.ebay.com/search/search.dll?query={searchTerms}&"
-    "MfcISAPICommand=GetResult&ht=1&ebaytag1=ebayreg&srchdesc=n&"
-    "maxRecordsReturned=300&maxRecordsPerPage=50&SortProperty=MetaEndSort" },
-  { L"google.com",
-    "http://www.google.com/search?q={searchTerms}&ie=utf-8&oe=utf-8&aq=t" },
-  { L"en.wikipedia.org",
-    "http://en.wikipedia.org/wiki/Special:Search?search={searchTerms}" },
-  { L"search.yahoo.com",
-    "http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8" },
-  { L"flickr.com",
-    "http://www.flickr.com/photos/tags/?q={searchTerms}" },
-  { L"imdb.com",
-    "http://www.imdb.com/find?q={searchTerms}" },
-  { L"webster.com",
-    "http://www.webster.com/cgi-bin/dictionary?va={searchTerms}" },
-  // Search keywords.
-  { L"\x4E2D\x6587", "http://www.google.com/" },
+    {L"amazon.com",
+     "http://www.amazon.com/exec/obidos/external-search/?field-keywords="
+     "{searchTerms}&mode=blended&tag=wwwcanoniccom-20"},
+    {L"bing.com", "http://www.bing.com/search?q={searchTerms}"},
+    {L"duckduckgo.com", "https://duckduckgo.com/?q={searchTerms}&t=canonical"},
+    {L"rover.ebay.com",
+     "http://rover.ebay.com/rover/1/711-47294-18009-3/4?mpre=http://"
+     "shop.ebay.com/?_nkw={searchTerms}"},
+    {L"google.com",
+     "http://www.google.com/"
+     "search?client=ubuntu&channel=fs&q={searchTerms}&ie=utf-8&oe=utf-8"},
+    {L"en.wikipedia.org",
+     "http://en.wikipedia.org/wiki/Special:Search?search={searchTerms}"},
+    {L"search.yahoo.com",
+     "http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8"},
+    {L"twitter.com",
+     "https://twitter.com/search?q={searchTerms}&source=desktop-search"},
+    // Search keywords.
+    {L"\x4E2D\x6587", "http://www.google.com/"},

[Ilya Sherman, 2014/05/01 21:37:02]

Hmm, it seems strange to need so many changes to this list.  For example, why is
the "&tag=wwwcanoniccom-20" URL parameter needed for Amazon?

It would be most convenient to simply have identical lists of search engines in
the 3.x profile and in the newest profile.  But, if that's not possible, then
let's preserve the original kFirefoxKeywords list as something like
kFirefox3xKeywords, and update the test code expectations to read from the
appropriate list, depending on which test case is being run.

 };
 
 class FirefoxObserver : public ProfileWriter,
@@ -248,8 +242,8 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
       if (!base::PathExists(data_path)) {
         // TODO(maruel):  Create search test data that we can open source!
         LOG(ERROR) << L"Missing internal test data";
-        return;
       }

[Ilya Sherman, 2014/05/01 21:37:02]

Can we get rid of lines 242-245 entirely?  Also possibly line 240 and 241, given
that line 246 is the same as 240?

Alternately, I'm noticing that the name of this test is
"Firefox3xImporterBrowserTest".  Perhaps it would be best to add a new method
for testing newer versions of Firefox, and leave this one as it was.

+      ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
       ASSERT_TRUE(base::CopyDirectory(data_path, search_engine_path, false));
     }
 
@@ -293,3 +287,9 @@ IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
   Firefox3xImporterBrowserTest("firefox35_profile", observer.get(),
                                observer.get(), import_search_engines);
 }
+
+IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, FirefoxImporter) {
+  scoped_refptr<FirefoxObserver> observer(new FirefoxObserver());
+  Firefox3xImporterBrowserTest(
+      "firefox_profile", observer.get(), observer.get(), true);
+}

[Ilya Sherman, 2014/05/01 21:37:02]

Please include a README file in the new test directory describing how the
directory was generated.