ImportDefault, ImportBookmarksFile and ImportNothingAndShowNewTabPage tests are failing consistentl…

chrome/browser/first_run/first_run_browsertest.cc

Index: chrome/browser/first_run/first_run_browsertest.cc
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index a642bf27917104576a90e9c2ba39605378b0277e..087c1dd2b7e197c811ebbb2c4937d167532ad09b 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -159,7 +159,13 @@ extern const char kImportDefault[] =
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportDefault>
     FirstRunMasterPrefsImportDefault;
-IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportDefault, ImportDefault) {
+// http://crbug.com/314221
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
+#define MAYBE_ImportDefault DISABLED_ImportDefault
+#else
+#define MAYBE_ImportDefault ImportDefault
+#endif
+IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportDefault, MAYBE_ImportDefault) {
   int auto_import_state = first_run::auto_import_state();
   EXPECT_EQ(MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED |
                                     first_run::AUTO_IMPORT_PROFILE_IMPORTED),
@@ -176,8 +182,14 @@ extern const char kImportBookmarksFile[] =
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile>
     FirstRunMasterPrefsImportBookmarksFile;
+// http://crbug.com/314221
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
+#define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile
+#else
+#define MAYBE_ImportBookmarksFile ImportBookmarksFile
+#endif
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile,
-                       ImportBookmarksFile) {
+                       MAYBE_ImportBookmarksFile) {
   int auto_import_state = first_run::auto_import_state();
   EXPECT_EQ(
       MaskExpectedImportState(first_run::AUTO_IMPORT_CALLED |
@@ -200,8 +212,15 @@ extern const char kImportNothing[] =
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportNothing>
     FirstRunMasterPrefsImportNothing;
+// http://crbug.com/314221
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
+#define MAYBE_ImportNothingAndShowNewTabPage \
+    DISABLED_ImportNothingAndShowNewTabPage

[gab, 2013/12/03 18:31:55]

nit: align DISABLED with MAYBE above.

[pshenoy, 2013/12/03 19:20:49]

I think it should be four space indent. 

[gab, 2013/12/03 19:37:25]

Just grep'ed the codebase and it looks like this is indeed fine (about 60% of
the codebase is 4 spaces and the rest is aligned in this scenario).

+#else
+#define MAYBE_ImportNothingAndShowNewTabPage ImportNothingAndShowNewTabPage
+#endif
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportNothing,
-                       ImportNothingAndShowNewTabPage) {
+                       MAYBE_ImportNothingAndShowNewTabPage) {
   EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, first_run::auto_import_state());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,