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 183 matching lines @@
       const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE {
   }
 
  private:
   virtual ~FirefoxObserver() {}
 
   size_t bookmark_count_;
   size_t history_count_;
   size_t password_count_;
   size_t keyword_count_;
   bool import_search_engines_;

[Ilya Sherman, 2014/06/17 23:26:42]

With your improvements to the tests, is it possible to now simply always test
search engine import, and remove this variable?

[Tapu Ghose, 2014/06/18 12:16:42]

I agree with you.

 };
 
 }  // namespace
 
 // These tests need to be browser tests in order to be able to run the OOP
 // import (via ExternalProcessImporterHost) which launches a utility process on
 // supported platforms.
 class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
  protected:
   virtual void SetUp() OVERRIDE {
     // Creates a new profile in a new subdirectory in the temp directory.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest");
     base::DeleteFile(test_path, true);
     base::CreateDirectory(test_path);
     profile_path_ = test_path.AppendASCII("profile");
     app_path_ = test_path.AppendASCII("app");
     base::CreateDirectory(app_path_);
 
     // This will launch the browser test and thus needs to happen last.
     InProcessBrowserTest::SetUp();
   }
 
-  void Firefox3xImporterBrowserTest(
-      std::string profile_dir,
-      importer::ImporterProgressObserver* observer,
-      ProfileWriter* writer,
-      bool import_search_plugins) {
+  void FirefoxImporterBrowserTest(std::string profile_dir,
+                                  importer::ImporterProgressObserver* observer,
+                                  ProfileWriter* writer,
+                                  bool import_search_plugins) {

[Ilya Sherman, 2014/06/17 23:26:42]

Ditto for this variable.

     base::FilePath data_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII(profile_dir);
     ASSERT_TRUE(base::CopyDirectory(data_path, profile_path_, true));
+
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII("firefox3_nss");
     ASSERT_TRUE(base::CopyDirectory(data_path, profile_path_, false));
 
-    base::FilePath search_engine_path = app_path_;
-    search_engine_path = search_engine_path.AppendASCII("searchplugins");
-    base::CreateDirectory(search_engine_path);
+    // default search engines
+    base::FilePath default_search_engine_path = app_path_;
+    default_search_engine_path =
+        default_search_engine_path.AppendASCII("searchplugins");
+    base::CreateDirectory(default_search_engine_path);

[Ilya Sherman, 2014/06/17 23:26:42]

nit: I'd condense these five lines a bit, like so:

    // Create a directory to house default search engines.
    base::FilePath default_search_engines_path =
        app_path_.AppendASCII("searchplugins");
    base::CreateDirectory(default_search_engines_path);

+
+    // custom/installed search engines
+    base::FilePath custom_search_engine_path = profile_path_;
+    custom_search_engine_path =
+        custom_search_engine_path.AppendASCII("searchplugins");

[Ilya Sherman, 2014/06/17 23:26:42]

Are you intentionally not calling base::CreateDirectory() for this path?

[Tapu Ghose, 2014/06/18 12:16:42]

It was unintentional.

+
     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));
+      data_path = data_path.AppendASCII("firefox_searchplugins");
+      base::FilePath default_search_engine_source_path = data_path;
+      base::FilePath custom_search_engine_source_path = data_path;
+      default_search_engine_source_path =
+          default_search_engine_source_path.AppendASCII("default");
+      custom_search_engine_source_path =
+          custom_search_engine_source_path.AppendASCII("custom");

[Ilya Sherman, 2014/06/17 23:26:42]

I'd similarly condense these six lines down to four.

+      ASSERT_TRUE(base::CopyDirectory(default_search_engine_source_path,
+                                      default_search_engine_path,
+                                      false));
+      ASSERT_TRUE(base::CopyDirectory(
+          custom_search_engine_source_path, custom_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;
     if (import_search_plugins)
       items = items | importer::SEARCH_ENGINES;
 
     // Deletes itself.
     ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
     host->set_observer(observer);
     host->StartImportSettings(source_profile,
                               browser()->profile(),
                               items,
                               make_scoped_refptr(writer).get());

[Ilya Sherman, 2014/06/17 23:26:42]

The more I look at the pre-existing test code, the more mystified I am.  This
"make_scoped_refptr(writer).get()" bit should almost certainly be replaced just
with "writer".  Mind making that change while you're here?

[Tapu Ghose, 2014/06/18 12:16:42]

Not a problem...I will make the change as you suggested.

     base::MessageLoop::current()->Run();
   }
 
   base::ScopedTempDir temp_dir_;
   base::FilePath profile_path_;
   base::FilePath app_path_;
 };
 
 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
                        MAYBE_IMPORTER(Firefox30Importer)) {
   scoped_refptr<FirefoxObserver> observer(new FirefoxObserver());
-  Firefox3xImporterBrowserTest("firefox3_profile", observer.get(),
-                               observer.get(), true);
+  FirefoxImporterBrowserTest(
+      "firefox3_profile", observer.get(), observer.get(), true);
 }
 
 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);
+  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);
+}