| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index 89df07b8fad8e0a2b33fc87fdfeffb604311b1da..5d37c5903c0e90ce842742bee07c2d2442d7c1c1 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "cc/test/fake_layer_tree_host_client.h"
|
| #include "cc/test/fake_layer_tree_host_impl.h"
|
| #include "cc/test/geometry_test_utils.h"
|
| +#include "cc/test/layer_test_common.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| #include "cc/trees/single_thread_proxy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -26,12 +27,6 @@ using ::testing::Mock;
|
| using ::testing::StrictMock;
|
| using ::testing::_;
|
|
|
| -#define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test) do { \
|
| - EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times((expect)); \
|
| - code_to_test; \
|
| - Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \
|
| - } while (false)
|
| -
|
| #define EXPECT_SET_NEEDS_FULL_TREE_SYNC(expect, code_to_test) do { \
|
| EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times((expect)); \
|
| code_to_test; \
|
|
|