Disable Failing Imports related tests on official bots.

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..ed875e82f7695c125fd0c1e6ce6388a73dd82e99 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) {
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
+// Fails on Mac and Linux official builds. See http://crbug.com/314221

[cpu_(ooo_6.6-7.5), 2013/11/01 22:49:04]

shouldn't the comment be "fails on Windows official builds" ?

I mean, it is disabled for Windows.

[gab, 2013/11/04 14:34:58]

The bug seems the suggest the problem is Mac.. ifdef is wrong?

+#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;
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
+// Fails on Mac and Linux official builds. See http://crbug.com/314221
+#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;
+#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
+// Fails on Mac and Linux official builds. See http://crbug.com/314221
+#define MAYBE_ImportNothingAndShowNewTabPage \
+    DISABLED_ImportNothingAndShowNewTabPage
+#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,