Mark tests as flaky based on recent buildbot runs.

Windows: three tests in DevToolsSanityTest
Mac: one in ExtensionBrowserTest

TBR=tonyg

BUG=45079, 45080
TEST=covered by buildbots

Review URL: http://codereview.chromium.org/2258003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48269 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 7 deletions

diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 6ca180b..90fd59e 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -369,30 +369,34 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalOnCallFrame) {
   RunTest("testEvalOnCallFrame", kDebuggerTestPage);
 }
 
+#if defined(OS_WIN)
+// See http://crbug.com/45080
+#define MAYBE_TestStepOver FLAKY_TestStepOver
+#else
+#define MAYBE_TestStepOver TestStepOver
+#endif
 // Tests step over functionality in the debugger.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestStepOver) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOver) {
   RunTest("testStepOver", kDebuggerStepTestPage);
 }
 
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-// See http://crbug.com/43479
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+// See http://crbug.com/43479 and http://crbug.com/45080
 #define MAYBE_TestStepOut FLAKY_TestStepOut
 #else
 #define MAYBE_TestStepOut TestStepOut
 #endif
-
 // Tests step out functionality in the debugger.
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOut) {
   RunTest("testStepOut", kDebuggerStepTestPage);
 }
 
-#if defined(OS_CHROMEOS)
-// See http://crbug.com/43479
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
+// See http://crbug.com/43479 and http://crbug.com/45080
 #define MAYBE_TestStepIn FLAKY_TestStepIn
 #else
 #define MAYBE_TestStepIn TestStepIn
 #endif
-
 // Tests step in functionality in the debugger.
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) {
   RunTest("testStepIn", kDebuggerStepTestPage);
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 89c5a76..3732dc0 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -274,6 +274,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) {
   ASSERT_TRUE(WaitForPageActionCountChangeTo(0));
 }
 
+// Flaky crash on Mac debug. http://crbug.com/45079
+#if defined(OS_MACOSX)
+#define PageActionRefreshCrash FLAKY_PageActionRefreshCrash
+#endif
 // Tests that we can load page actions in the Omnibox.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) {
   ExtensionsService* service = browser()->profile()->GetExtensionsService();