Fixing Firefox 21+ password import

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 e6b4de81c9a14a51b524c440a3f031295e697e1b..424d43285b412453da27686fb10de94b8e1d72bd 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -24,9 +24,8 @@
 #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
@@ -236,7 +235,11 @@ class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
     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_;