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

chrome/test/perf/frame_rate/frame_rate_tests.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 <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
@@ skipping 252 matching lines @@
 TEST_P(FrameRateCompositingTest, content) { \
   RunTest(#content); \
 }
 
 INSTANTIATE_TEST_CASE_P(, FrameRateCompositingTest, ::testing::Values(
                         0,
                         kUseGpu | kForceGpuComposited,
                         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;
 
 // Tests for animated 2D canvas content with and without disabling vsync
 #define INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(content) \
 TEST_P(FrameRateNoVsyncCanvasInternalTest, content) { \
   RunTest(#content); \
 }
 
 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values(
     kInternal | kHasRedirect,
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu,
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kUseReferenceBuild | kInternal | kHasRedirect,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     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;
 
 // Tests for animated 2D canvas content to be tested only with GPU
 // acceleration.
 // tests are run with and without Vsync
 #define INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(content) \
 TEST_P(FrameRateGpuCanvasInternalTest, content) { \
   RunTest(#content); \
 }
 
 INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values(
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu,
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     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