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

chrome/browser/importer/firefox_importer_browsertest.cc

 // Copyright (c) 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 "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 49 matching lines @@
 };
 
 const PasswordInfo kFirefoxPasswords[] = {
   {"http://localhost:8080/", "http://localhost:8080/", "http://localhost:8080/",
     L"loginuser", L"abc", L"loginpass", L"123", false},
   {"http://localhost:8080/", "", "http://localhost:8080/localhost",
     L"", L"http", L"", L"Http1+1abcdefg", false},
 };
 
 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,
                         public importer::ImporterProgressObserver {
  public:
   FirefoxObserver()
       : ProfileWriter(NULL), bookmark_count_(0), history_count_(0),
         password_count_(0), keyword_count_(0), import_search_engines_(true) {
   }
 
@@ skipping 136 matching lines @@
 
     base::FilePath search_engine_path = app_path_;
     search_engine_path = search_engine_path.AppendASCII("searchplugins");
     base::CreateDirectory(search_engine_path);
     if (import_search_plugins) {
       ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
       data_path = data_path.AppendASCII("firefox3_searchplugins");
       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));
     }
 
     importer::SourceProfile source_profile;
     source_profile.importer_type = importer::TYPE_FIREFOX;
     source_profile.app_path = app_path_;
     source_profile.source_path = profile_path_;
     source_profile.locale = "en-US";
 
     int items = importer::HISTORY | importer::PASSWORDS | importer::FAVORITES;
@@ skipping 23 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
                        MAYBE_IMPORTER(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<FirefoxObserver> observer(
       new FirefoxObserver(import_search_engines));
   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.