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/net/dns_master.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/net/dns_master.h')
| -rw-r--r-- | chrome/browser/net/dns_master.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/net/dns_master.h b/chrome/browser/net/dns_master.h index 8449731..0586b1c 100644 --- a/chrome/browser/net/dns_master.h +++ b/chrome/browser/net/dns_master.h @@ -19,12 +19,12 @@ #include <set> #include <string> +#include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "chrome/browser/net/dns_host_info.h" #include "chrome/browser/net/referrer.h" #include "chrome/common/net/dns.h" #include "net/base/host_port_pair.h" -#include "testing/gtest/include/gtest/gtest_prod.h" namespace net { class HostResolver; @@ -115,13 +115,13 @@ class DnsMaster : public base::RefCountedThreadSafe<DnsMaster> { private: friend class base::RefCountedThreadSafe<DnsMaster>; - FRIEND_TEST(DnsMasterTest, BenefitLookupTest); - FRIEND_TEST(DnsMasterTest, ShutdownWhenResolutionIsPendingTest); - FRIEND_TEST(DnsMasterTest, SingleLookupTest); - FRIEND_TEST(DnsMasterTest, ConcurrentLookupTest); - FRIEND_TEST(DnsMasterTest, MassiveConcurrentLookupTest); - FRIEND_TEST(DnsMasterTest, PriorityQueuePushPopTest); - FRIEND_TEST(DnsMasterTest, PriorityQueueReorderTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, BenefitLookupTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, ShutdownWhenResolutionIsPendingTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, SingleLookupTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, ConcurrentLookupTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, MassiveConcurrentLookupTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, PriorityQueuePushPopTest); + FRIEND_TEST_ALL_PREFIXES(DnsMasterTest, PriorityQueueReorderTest); friend class WaitForResolutionHelper; // For testing. ~DnsMaster(); |