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 c56af96e163f76e0da386b18c2b9d88f409deae5..043eecdf38b2ca77da35841c83e47d8edcfad55e 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -225,7 +225,7 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUp();
   }
 
-  void Firefox3xImporterBrowserTest(
+  void FirefoxImporterBrowserTest(
       std::string profile_dir,
       importer::ImporterProgressObserver* observer,
       ProfileWriter* writer,
@@ -243,12 +243,6 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
     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) << "Missing internal test data";
-        return;
-      }
       ASSERT_TRUE(base::CopyDirectory(data_path, search_engine_path, false));
     }
 
@@ -280,7 +274,7 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
                        MAYBE_IMPORTER(Firefox30Importer)) {
   scoped_refptr<FirefoxObserver> observer(new FirefoxObserver());
-  Firefox3xImporterBrowserTest("firefox3_profile", observer.get(),
+  FirefoxImporterBrowserTest("firefox3_profile", observer.get(),
                                observer.get(), true);

[Ilya Sherman, 2014/05/29 07:21:58]

nit: Please fix the alignment of the text on this line.  Ditto for the other two
tests.

 }
 
@@ -289,6 +283,13 @@ IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
   bool import_search_engines = false;
   scoped_refptr<FirefoxObserver> observer(
       new FirefoxObserver(import_search_engines));
-  Firefox3xImporterBrowserTest("firefox35_profile", observer.get(),
+  FirefoxImporterBrowserTest("firefox35_profile", observer.get(),
                                observer.get(), import_search_engines);
 }
+
+
+IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, FirefoxImporter) {
+  scoped_refptr<FirefoxObserver> observer(new FirefoxObserver());
+  FirefoxImporterBrowserTest("firefox_profile", observer.get(),
+                               observer.get(), true);
+}