| Index: cc/test/layer_tree_test_common.h
|
| diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
|
| index 3c28496326263add0669f9f2fe5846a7fa87d961..9f35b886b3e075d542776892ae75ce2eaaaf04aa 100644
|
| --- a/cc/test/layer_tree_test_common.h
|
| +++ b/cc/test/layer_tree_test_common.h
|
| @@ -174,44 +174,4 @@ private:
|
| SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME) \
|
| MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
|
|
|
| -#define MULTI_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1_NAME, P1) \
|
| - class TEST_FIXTURE_NAME##_##P1_NAME : public TEST_FIXTURE_NAME { \
|
| - public: \
|
| - TEST_FIXTURE_NAME##_##P1_NAME() \
|
| - : TEST_FIXTURE_NAME(P1) {} \
|
| - }; \
|
| - MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME##_##P1)
|
| -
|
| -#define SINGLE_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1_NAME, P1) \
|
| - class TEST_FIXTURE_NAME##_##P1_NAME : public TEST_FIXTURE_NAME { \
|
| - public: \
|
| - TEST_FIXTURE_NAME##_##P1_NAME() \
|
| - : TEST_FIXTURE_NAME(P1) {} \
|
| - }; \
|
| - SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME##_##P1_NAME)
|
| -
|
| -#define SINGLE_AND_MULTI_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1_NAME, P1) \
|
| - SINGLE_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1) \
|
| - MULTI_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1)
|
| -
|
| -#define MULTI_THREAD_TEST_P2(TEST_FIXTURE_NAME, P1_NAME, P1, P2_NAME, P2) \
|
| - class TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME : public TEST_FIXTURE_NAME { \
|
| - public: \
|
| - TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME() \
|
| - : TEST_FIXTURE_NAME(P1, P2) {} \
|
| - }; \
|
| - MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME)
|
| -
|
| -#define SINGLE_THREAD_TEST_P2(TEST_FIXTURE_NAME, P1_NAME, P1, P2_NAME, P2) \
|
| - class TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME : public TEST_FIXTURE_NAME { \
|
| - public: \
|
| - TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME() \
|
| - : TEST_FIXTURE_NAME(P1, P2) {} \
|
| - }; \
|
| - SINGLE_THREAD_TEST_F(TEST_FIXTURE_NAME##_##P1_NAME##_##P2_NAME)
|
| -
|
| -#define SINGLE_AND_MULTI_THREAD_TEST_P2(TEST_FIXTURE_NAME, P1_NAME, P1, P2_NAME, P2) \
|
| - SINGLE_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1, P2) \
|
| - MULTI_THREAD_TEST_P1(TEST_FIXTURE_NAME, P1, P2)
|
| -
|
| #endif // CC_TEST_LAYER_TREE_TEST_COMMON_H_
|
|
|