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

These tests are failing since the MS 2008 - 2010 switch.  Turning them off to make the tree green until someone takes the bug and figures out how to fix it.

BUG=132133
TEST=gpu win release bots
TBR=nduca
Review URL: https://chromiumcodereview.appspot.com/10540111

TBR=zmo@google.com
Review URL: https://chromiumcodereview.appspot.com/10704161

TBR=jbates@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10695160

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

chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -270,8 +270,11 @@ INSTANTIATE_TEST_CASE_P(, FrameRateCompositingTest, ::testing::Values(
                         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 @@ INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values(
     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 @@ INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values(
     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