Mark the following tests FLAKY on Windows.

- NPAPITester.NoHangIfInitCrashes
- MetricsServiceTest.CrashRenderers
- ResourceDispatcherTest.CrossSiteAfterCrash
- RendererCrashTest.Crash

BUG=32048
TEST=none
TBR=jar, nsylvain
Review URL: http://codereview.chromium.org/548009

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

4 files changed, 14 insertions, 1 deletions

diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index 5127208..0e85654 100644
--- a/chrome/browser/metrics/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
@@ -71,6 +71,10 @@ TEST_F(MetricsServiceTest, CloseRenderersNormally) {
   EXPECT_EQ(0, local_state->GetInteger(prefs::kStabilityRendererCrashCount));
 }
 
+#if defined(OS_WIN)
+// http://crbug.com/32048
+#define CrashRenderes FLAKY_CrashRenders
+#endif
 TEST_F(MetricsServiceTest, CrashRenderers) {
   // This doesn't make sense to test in single process mode.
   if (in_process_renderer_)
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 6b45924..58f6591 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -194,6 +194,10 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) {
 }
 
 #if !defined(OS_MACOSX)
+#if defined(OS_WIN)
+// http://crbug.com/32048
+#define CrossSiteAfterCrash FLAKY_CrossSiteAfterCrash
+#endif
 // Tests that the onbeforeunload and onunload logic is shortcutted if the old
 // renderer is gone.  In that case, we don't want to wait for the old renderer
 // to run the handlers.
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index aeb79dc..1e75c66 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -104,6 +104,10 @@ class RendererCrashTest : public UITest {
   }
 };
 
+#if defined(OS_WIN)
+// http://crbug.com/32048
+#define Crash FLAKY_Crash
+#endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, Crash) {
   if (UITest::in_process_renderer()) {
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 13ec73f..05d2efa4 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -365,7 +365,8 @@ TEST_F(NPAPITester, EnsureScriptingWorksInDestroy) {
 
 // This test uses a Windows Event to signal to the plugin that it should crash
 // on NP_Initialize.
-TEST_F(NPAPITester, NoHangIfInitCrashes) {
+// This is flaky. http://crbug.com/32048
+TEST_F(NPAPITester, FLAKY_NoHangIfInitCrashes) {
   if (UITest::in_process_renderer())
     return;