ImportDefault, ImportBookmarksFile and ImportNothingAndShowNewTabPage tests are failing consistentl…

chrome/browser/first_run/first_run_browsertest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 141 matching lines @@
   return expected_import_state;
 }
 
 }  // namespace
 
 extern const char kImportDefault[] =
     "{\n"
     "}\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),
             auto_import_state);
 }
 
 // The bookmarks file doesn't actually need to exist for this integration test
 // to trigger the interaction being tested.
 extern const char kImportBookmarksFile[] =
     "{\n"
     "  \"distribution\": {\n"
     "     \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n"
     "  }\n"
     "}\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 |
                               first_run::AUTO_IMPORT_PROFILE_IMPORTED |
                               first_run::AUTO_IMPORT_BOOKMARKS_FILE_IMPORTED),
       auto_import_state);
 }
 
 // Test an import with all import options disabled. This is a regression test
 // for http://crbug.com/169984 where this would cause the import process to
 // stay running, and the NTP to be loaded with no apps.
 extern const char kImportNothing[] =
     "{\n"
     "  \"distribution\": {\n"
     "    \"import_bookmarks\": false,\n"
     "    \"import_history\": false,\n"
     "    \"import_home_page\": false,\n"
     "    \"import_search_engine\": false\n"
     "  }\n"
     "}\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,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
   EXPECT_EQ(1, tab->GetMaxPageID());
 }
 
 #endif  // !defined(OS_CHROMEOS)