Disable PerfRestoreSeveralTabs in debug because it fails too often.

chrome/test/perf/startup_test.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/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 358 matching lines @@
 #if defined(OS_MACOSX)
 // http://crbug.com/46609
 #define MAYBE_PerfSeveralTabsReference DISABLED_PerfSeveralTabsReference
 #define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
 // http://crbug.com/52858
 #define MAYBE_PerfRestoreSeveralTabs DISABLED_PerfRestoreSeveralTabs
 #define MAYBE_PerfExtensionContentScript50 DISABLED_PerfExtensionContentScript50
 #elif defined(OS_WIN)
 // http://crbug.com/46609
 #if !defined(NDEBUG)
+// This test is disabled on Windows Debug. See bug http://crbug.com/132279
+#define MAYBE_PerfRestoreSeveralTabs DISABLED_PerfRestoreSeveralTabs
+#else
+#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
+#endif  // !defined(NDEBUG)

[cmp, 2012/06/12 17:44:57]

what a mess!  not only is the near-100% operation around these lines to mark
something as disabled (instead of removing disabled), these defines are really
hard to follow and ensure the right changes are being made.  but after staring
at it for a bit, this looks good.  thanks.

 // http://crbug.com/102584
 #define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
-#else
-#define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
-#endif
 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
-#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
 #else
 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
 #define MAYBE_PerfSeveralTabs PerfSeveralTabs
 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
 #endif
 
 // http://crbug.com/99604
 #if defined(OS_WIN) && !defined(NDEBUG)
@@ skipping 57 matching lines @@
                  UITestBase::CUSTOM_FRAME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
   RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
                  UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
 }
 #endif
 
 }  // namespace