summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_unittest.cc
diff options
context:
space:
mode:
authorbrianderson <brianderson@chromium.org>2015-06-12 16:27:59 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-12 23:28:32 +0000
commit16b14c0d473dd1595547f527654b21d21a0af953 (patch)
treeb56a7be7ff78475fa2125c6f8c7216fd66c77604 /cc/trees/layer_tree_host_unittest.cc
parentbfbc11d92d74397af60484590a7f763e3936a193 (diff)
downloadchromium_src-16b14c0d473dd1595547f527654b21d21a0af953.zip
chromium_src-16b14c0d473dd1595547f527654b21d21a0af953.tar.gz
chromium_src-16b14c0d473dd1595547f527654b21d21a0af953.tar.bz2
cc: Re-enable LayerTreeHostTestNumFramesPending tests
The flake was previously occurring during CompositeAndReadback, which is long gone now. BUG=327498 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1179313002 Cr-Commit-Position: refs/heads/master@{#334277}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest.cc')
-rw-r--r--cc/trees/layer_tree_host_unittest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 451ec25..904bdca 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -2669,14 +2669,7 @@ class LayerTreeHostTestNumFramesPending : public LayerTreeHostTest {
int frame_;
};
-// Flaky on all platforms: http://crbug.com/327498
-TEST_F(LayerTreeHostTestNumFramesPending, DISABLED_DelegatingRenderer) {
- RunTest(true, true, true);
-}
-
-TEST_F(LayerTreeHostTestNumFramesPending, DISABLED_GLRenderer) {
- RunTest(true, false, true);
-}
+SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNumFramesPending);
class LayerTreeHostTestResourcelessSoftwareDraw : public LayerTreeHostTest {
public: