| Index: cc/test/layer_tree_test.h
|
| diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
|
| index f2a56c10b8c1c1fa2d3c00275568b0b58bcfae35..b9a509078e712c463de66f9ec42523fa3af8cce5 100644
|
| --- a/cc/test/layer_tree_test.h
|
| +++ b/cc/test/layer_tree_test.h
|
| @@ -149,8 +149,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
| std::unique_ptr<OutputSurface> CreateDisplayOutputSurfaceOnThread(
|
| scoped_refptr<ContextProvider> compositor_context_provider) override;
|
|
|
| - bool IsRemoteTest() const;
|
| -
|
| gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl);
|
|
|
| private:
|
| @@ -214,12 +212,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
| } \
|
| class MultiThreadDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
|
|
| -#define REMOTE_TEST_F(TEST_FIXTURE_NAME) \
|
| - TEST_F(TEST_FIXTURE_NAME, RunRemote_DelegatingRenderer) { \
|
| - RunTest(CompositorMode::REMOTE); \
|
| - } \
|
| - class RemoteDelegatingImplNeedsSemicolon##TEST_FIXTURE_NAME {}
|
| -
|
| #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME) \
|
| SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME); \
|
| MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
|
| @@ -228,10 +220,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
|
| MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME); \
|
| REMOTE_TEST_F(TEST_FIXTURE_NAME)
|
|
|
| -#define SINGLE_MULTI_AND_REMOTE_TEST_F(TEST_FIXTURE_NAME) \
|
| - SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME); \
|
| - REMOTE_TEST_F(TEST_FIXTURE_NAME)
|
| -
|
| // Some tests want to control when notify ready for activation occurs,
|
| // but this is not supported in the single-threaded case.
|
| #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
|
|
|