summaryrefslogtreecommitdiffstats
path: root/chrome/test/perf
diff options
context:
space:
mode:
authorjunov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-28 20:42:52 +0000
committerjunov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-28 20:42:52 +0000
commit30927710a0b1ea177c64133a590d38452b5ee4f1 (patch)
tree184b260beb00173c4d71f9356ec8f8c9c13ec94b /chrome/test/perf
parent68e8bd4e28f05e634ded3210f5d0c4e882b837e7 (diff)
downloadchromium_src-30927710a0b1ea177c64133a590d38452b5ee4f1.zip
chromium_src-30927710a0b1ea177c64133a590d38452b5ee4f1.tar.gz
chromium_src-30927710a0b1ea177c64133a590d38452b5ee4f1.tar.bz2
Re-enabling speedreading frame rate test.
Upstream test content was corrected. BUG=http://code.google.com/p/chromium/issues/detail?id=115720 TEST=frame_rate_test, speedreading on linux Review URL: https://chromiumcodereview.appspot.com/9513012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r--chrome/test/perf/frame_rate/frame_rate_tests.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
index 7197ece..27cfd80 100644
--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -296,11 +296,6 @@ INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values(
INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
-
-// crbug.com/115720
-#if defined(OS_LINUX)
-#define speedreading FAILS_speedreading
-#endif
INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
} // namespace