summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/dns_master.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 21:51:41 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 21:51:41 +0000
commit7d1e0d0bd5b0a3d56471bbfa7542aff36607463d (patch)
treeab9dd51f551c7d1847dd428b135a15a64d749c5f /chrome/browser/net/dns_master.h
parent38259a7a83545e07681d921564468844c7b03337 (diff)
downloadchromium_src-7d1e0d0bd5b0a3d56471bbfa7542aff36607463d.zip
chromium_src-7d1e0d0bd5b0a3d56471bbfa7542aff36607463d.tar.gz
chromium_src-7d1e0d0bd5b0a3d56471bbfa7542aff36607463d.tar.bz2
Undisable DnsMasterTest.MassiveConcurrentLookupTest.
It still passes, and provides coverage for situation where there are lots of DNS requests at the same time. TEST=none BUG=none Review URL: http://codereview.chromium.org/159601 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/dns_master.h')
-rw-r--r--chrome/browser/net/dns_master.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/net/dns_master.h b/chrome/browser/net/dns_master.h
index 608dba8..1bf87d0 100644
--- a/chrome/browser/net/dns_master.h
+++ b/chrome/browser/net/dns_master.h
@@ -107,7 +107,7 @@ class DnsMaster : public base::RefCountedThreadSafe<DnsMaster> {
FRIEND_TEST(DnsMasterTest, ShutdownWhenResolutionIsPendingTest);
FRIEND_TEST(DnsMasterTest, SingleLookupTest);
FRIEND_TEST(DnsMasterTest, ConcurrentLookupTest);
- FRIEND_TEST(DnsMasterTest, DISABLED_MassiveConcurrentLookupTest);
+ FRIEND_TEST(DnsMasterTest, MassiveConcurrentLookupTest);
FRIEND_TEST(DnsMasterTest, PriorityQueuePushPopTest);
FRIEND_TEST(DnsMasterTest, PriorityQueueReorderTest);
friend class WaitForResolutionHelper; // For testing.