| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 6b781cb60ef6f8989577521f22ca4df5e63ead2a..b4b64791629608269688f5b68942194e56e6a330 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -91,8 +91,8 @@ class LayerTreeHostTestSetNeedsCommit1 : public LayerTreeHostTest {
|
| }
|
|
|
| virtual void AfterTest() OVERRIDE {
|
| - EXPECT_GE(1, num_commits_);
|
| - EXPECT_GE(1, num_draws_);
|
| + EXPECT_LE(1, num_commits_);
|
| + EXPECT_LE(1, num_draws_);
|
| }
|
|
|
| private:
|
| @@ -1966,7 +1966,7 @@ class LayerTreeHostTestDeferCommits : public LayerTreeHostTest {
|
| int num_complete_commits_;
|
| };
|
|
|
| -MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
|
| +SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
|
|
|
| class LayerTreeHostWithProxy : public LayerTreeHost {
|
| public:
|
| @@ -4632,7 +4632,8 @@ class LayerTreeHostTestHighResRequiredAfterEvictingUIResources
|
| };
|
|
|
| // This test is flaky, see http://crbug.com/386199
|
| -//MULTI_THREAD_TEST_F(LayerTreeHostTestHighResRequiredAfterEvictingUIResources);
|
| +// MULTI_THREAD_TEST_F(
|
| +// LayerTreeHostTestHighResRequiredAfterEvictingUIResources);
|
|
|
| class LayerTreeHostTestGpuRasterizationDefault : public LayerTreeHostTest {
|
| protected:
|
|
|