diff options
| -rw-r--r-- | base/gtest_prod_util.h | 15 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/print_preview/sticky_settings.h | 14 |
2 files changed, 11 insertions, 18 deletions
diff --git a/base/gtest_prod_util.h b/base/gtest_prod_util.h index 2db5853..38a72b4 100644 --- a/base/gtest_prod_util.h +++ b/base/gtest_prod_util.h @@ -41,11 +41,11 @@ // } // // Unless you forward declare MyClassTest::TestMethod outside of namespace foo. -// Use FORWARD_DECLARE_TEST_ALL_PREFIXES to do so for all possible prefixes. +// Use FORWARD_DECLARE_TEST to do so for all possible prefixes. // // Example usage: // -// FORWARD_DECLARE_TEST_ALL_PREFIXES(MyClassTest, TestMethod); +// FORWARD_DECLARE_TEST(MyClassTest, TestMethod); // // namespace foo { // class MyClass { @@ -61,12 +61,9 @@ // } #define FORWARD_DECLARE_TEST(test_case_name, test_name) \ -class test_case_name##_##test_name##_Test\ - -#define FORWARD_DECLARE_TEST_ALL_PREFIXES(test_case_name, test_name) \ - FORWARD_DECLARE_TEST(test_case_name, test_name); \ - FORWARD_DECLARE_TEST(test_case_name, DISABLED_##test_name); \ - FORWARD_DECLARE_TEST(test_case_name, FLAKY_##test_name); \ - FORWARD_DECLARE_TEST(test_case_name, FAILS_##test_name) + class test_case_name##_##test_name##_Test; \ + class test_case_name##_##DISABLED_##test_name##_Test; \ + class test_case_name##_##FLAKY_##test_name##_Test; \ + class test_case_name##_##FAILS_##test_name##_Test #endif // BASE_GTEST_PROD_UTIL_H_ diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.h b/chrome/browser/ui/webui/print_preview/sticky_settings.h index e5726c9..d7491cd 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.h +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.h @@ -23,15 +23,11 @@ namespace printing { struct PageSizeMargins; } -FORWARD_DECLARE_TEST_ALL_PREFIXES(PrintPreviewHandlerTest, StickyMarginsCustom); -FORWARD_DECLARE_TEST_ALL_PREFIXES(PrintPreviewHandlerTest, - StickyMarginsDefault); -FORWARD_DECLARE_TEST_ALL_PREFIXES(PrintPreviewHandlerTest, - StickyMarginsCustomThenDefault); -FORWARD_DECLARE_TEST_ALL_PREFIXES(PrintPreviewHandlerTest, - GetLastUsedMarginSettingsCustom); -FORWARD_DECLARE_TEST_ALL_PREFIXES(PrintPreviewHandlerTest, - GetLastUsedMarginSettingsDefault); +FORWARD_DECLARE_TEST(PrintPreviewHandlerTest, StickyMarginsCustom); +FORWARD_DECLARE_TEST(PrintPreviewHandlerTest, StickyMarginsDefault); +FORWARD_DECLARE_TEST(PrintPreviewHandlerTest, StickyMarginsCustomThenDefault); +FORWARD_DECLARE_TEST(PrintPreviewHandlerTest, GetLastUsedMarginSettingsCustom); +FORWARD_DECLARE_TEST(PrintPreviewHandlerTest, GetLastUsedMarginSettingsDefault); namespace printing { |