Fixing Firefox 21+ password import

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"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_unittest_utils.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/common/password_form.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// TODO(estade): some of these are disabled on mac. http://crbug.com/48007
 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
-#if defined(OS_MACOSX) || (defined(OS_WIN) && defined(ARCH_CPU_X86_64))
+#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 #define MAYBE_IMPORTER(x) DISABLED_##x
 #else
 #define MAYBE_IMPORTER(x) x
 #endif
 
 namespace {
 
 struct PasswordInfo {
   const char* origin;
   const char* action;
@@ skipping 189 matching lines @@
   void Firefox3xImporterBrowserTest(
       std::string profile_dir,
       importer::ImporterProgressObserver* observer,
       ProfileWriter* writer,
       bool import_search_plugins) {
     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));
+#if defined(OS_MACOSX)
+    data_path = data_path.AppendASCII("firefox3_nss_mac");

[jeremy, 2013/12/17 11:48:09]

I think this needs to be part of the CL as well?

[mpawlowski, 2013/12/17 12:31:25]

Added a sentence in the CL.

+#else
     data_path = data_path.AppendASCII("firefox3_nss");
+#endif
     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);
     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!
@@ skipping 36 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);
 }