diff options
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/dns_master.h | 2 | ||||
| -rw-r--r-- | chrome/browser/net/dns_master_unittest.cc | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/chrome/browser/net/dns_master_unittest.cc b/chrome/browser/net/dns_master_unittest.cc index 321348d..0093732 100644 --- a/chrome/browser/net/dns_master_unittest.cc +++ b/chrome/browser/net/dns_master_unittest.cc @@ -343,7 +343,7 @@ TEST_F(DnsMasterTest, ConcurrentLookupTest) { testing_master->Shutdown(); } -TEST_F(DnsMasterTest, DISABLED_MassiveConcurrentLookupTest) { +TEST_F(DnsMasterTest, MassiveConcurrentLookupTest) { host_resolver_->rules()->AddSimulatedFailure("*.notfound"); scoped_refptr<DnsMaster> testing_master = new DnsMaster(host_resolver_, |