Revert 146150 - Revert 141510 - Disable framerate tests on Windows.

chrome/test/perf/frame_rate/frame_rate_tests.cc

Index: chrome/test/perf/frame_rate/frame_rate_tests.cc
===================================================================
--- chrome/test/perf/frame_rate/frame_rate_tests.cc	(revision 146209)
+++ chrome/test/perf/frame_rate/frame_rate_tests.cc	(working copy)
@@ -270,8 +270,11 @@
                         kUseReferenceBuild,
                         kUseReferenceBuild | kUseGpu | kForceGpuComposited));
 
+// crbug.com/132133
+#if !defined(OS_WIN)
 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(blank);
 FRAME_RATE_TEST_WITH_AND_WITHOUT_ACCELERATED_COMPOSITING(googleblog);
+#endif
 
 typedef FrameRateTest FrameRateNoVsyncCanvasInternalTest;
 
@@ -290,7 +293,10 @@
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu |
         kDisableVsync));
 
+// crbug.com/132133
+#if !defined(OS_WIN)
 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl)
+#endif
 
 typedef FrameRateTest FrameRateGpuCanvasInternalTest;
 
@@ -309,8 +315,11 @@
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu |
         kDisableVsync));
 
+// crbug.com/132133
+#if !defined(OS_WIN)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
+#endif
 
 }  // namespace