diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 14:30:51 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 14:30:51 +0000 |
| commit | a918f877c38b7a0bc684a2963fba4a4341a243e8 (patch) | |
| tree | b58938b92989fa1a75e8e2b0b62c21944d4cd3bb /chrome/browser/encoding_menu_controller.h | |
| parent | be4d55fe8d843628223a7b40162007ab734d1402 (diff) | |
| download | chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.zip chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.gz chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.bz2 | |
[GTTF] Add FRIEND_TEST_ALL_PREFIXES, a FRIEND_TEST replacement
that works with all test prefixes (DISABLED, FLAKY, FAILS).
TEST=none
BUG=44549
Review URL: http://codereview.chromium.org/2439001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/encoding_menu_controller.h')
| -rw-r--r-- | chrome/browser/encoding_menu_controller.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/encoding_menu_controller.h b/chrome/browser/encoding_menu_controller.h index d362f68..44f5877 100644 --- a/chrome/browser/encoding_menu_controller.h +++ b/chrome/browser/encoding_menu_controller.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" // For DISALLOW_COPY_AND_ASSIGN +#include "base/gtest_prod_util.h" #include "base/string16.h" -#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST class Browser; class Profile; @@ -19,8 +19,8 @@ class Profile; // Cross-platform logic needed for the encoding menu. // For now, we don't need to track state so all methods are static. class EncodingMenuController { - FRIEND_TEST(EncodingMenuControllerTest, EncodingIDsBelongTest); - FRIEND_TEST(EncodingMenuControllerTest, IsItemChecked); + FRIEND_TEST_ALL_PREFIXES(EncodingMenuControllerTest, EncodingIDsBelongTest); + FRIEND_TEST_ALL_PREFIXES(EncodingMenuControllerTest, IsItemChecked); public: typedef std::pair<int, string16> EncodingMenuItem; |