Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: net/dns/host_resolver_impl_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/dns/host_resolver_impl.cc ('k') | net/dns/host_resolver_proc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/host_resolver_impl_unittest.cc
diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc
index b677af498a990e5e011254c64a88f186c9255e9e..74c16f3b15fd548a587f3c103a8a5afee396644b 100644
--- a/net/dns/host_resolver_impl_unittest.cc
+++ b/net/dns/host_resolver_impl_unittest.cc
@@ -436,17 +436,16 @@ class HostResolverImplTest : public testing::Test {
};
void CreateResolver() {
- resolver_.reset(new HostResolverImpl(
- HostCache::CreateDefaultCache(),
- DefaultLimits(),
- DefaultParams(proc_),
- NULL));
+ resolver_.reset(new HostResolverImpl(HostCache::CreateDefaultCache(),
+ DefaultLimits(),
+ DefaultParams(proc_.get()),
+ NULL));
}
// This HostResolverImpl will only allow 1 outstanding resolve at a time and
// perform no retries.
void CreateSerialResolver() {
- HostResolverImpl::ProcTaskParams params = DefaultParams(proc_);
+ HostResolverImpl::ProcTaskParams params = DefaultParams(proc_.get());
params.max_retry_attempts = 0u;
PrioritizedDispatcher::Limits limits(NUM_PRIORITIES, 1);
resolver_.reset(new HostResolverImpl(
@@ -781,11 +780,10 @@ TEST_F(HostResolverImplTest, StartWithinCallback) {
set_handler(new MyHandler());
// Turn off caching for this host resolver.
- resolver_.reset(new HostResolverImpl(
- scoped_ptr<HostCache>(),
- DefaultLimits(),
- DefaultParams(proc_),
- NULL));
+ resolver_.reset(new HostResolverImpl(scoped_ptr<HostCache>(),
+ DefaultLimits(),
+ DefaultParams(proc_.get()),
+ NULL));
for (size_t i = 0; i < 4; ++i) {
EXPECT_EQ(ERR_IO_PENDING, CreateRequest("a", 80 + i)->Resolve()) << i;
@@ -1270,11 +1268,10 @@ class HostResolverImplDnsTest : public HostResolverImplTest {
}
void CreateResolver() {
- resolver_.reset(new HostResolverImpl(
- HostCache::CreateDefaultCache(),
- DefaultLimits(),
- DefaultParams(proc_),
- NULL));
+ resolver_.reset(new HostResolverImpl(HostCache::CreateDefaultCache(),
+ DefaultLimits(),
+ DefaultParams(proc_.get()),
+ NULL));
resolver_->SetDnsClient(CreateMockDnsClient(DnsConfig(), dns_rules_));
}
@@ -1514,7 +1511,7 @@ TEST_F(HostResolverImplDnsTest, DualFamilyLocalhost) {
scoped_refptr<HostResolverProc> proc(new SystemHostResolverProc());
resolver_.reset(new HostResolverImpl(HostCache::CreateDefaultCache(),
DefaultLimits(),
- DefaultParams(proc),
+ DefaultParams(proc.get()),
NULL));
resolver_->SetDnsClient(CreateMockDnsClient(DnsConfig(), dns_rules_));
resolver_->SetDefaultAddressFamily(ADDRESS_FAMILY_IPV4);
« no previous file with comments | « net/dns/host_resolver_impl.cc ('k') | net/dns/host_resolver_proc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698