Index: net/dns/host_resolver_mojo_unittest.cc |
diff --git a/net/dns/host_resolver_mojo_unittest.cc b/net/dns/host_resolver_mojo_unittest.cc |
index 1c14a24e2d8df3bdb05adea5f5b32bd6bf58a71e..baa16795f648f82935e599c285e08b4766fdbb4f 100644 |
--- a/net/dns/host_resolver_mojo_unittest.cc |
+++ b/net/dns/host_resolver_mojo_unittest.cc |
@@ -167,9 +167,9 @@ class HostResolverMojoTest : public testing::Test { |
int Resolve(const HostResolver::RequestInfo& request_info, |
AddressList* result) { |
TestCompletionCallback callback; |
- return callback.GetResult(resolver_->Resolve(request_info, DEFAULT_PRIORITY, |
- result, callback.callback(), |
- &request_, BoundNetLog())); |
+ return callback.GetResult( |
+ resolver_->Resolve(request_info, DEFAULT_PRIORITY, result, |
+ callback.callback(), &request_, NetLogWithSource())); |
} |
std::unique_ptr<MockMojoHostResolver> mock_resolver_; |
@@ -259,12 +259,12 @@ TEST_F(HostResolverMojoTest, Multiple) { |
std::unique_ptr<HostResolver::Request> request2; |
TestCompletionCallback callback1; |
TestCompletionCallback callback2; |
- ASSERT_EQ(ERR_IO_PENDING, |
- resolver_->Resolve(request_info1, DEFAULT_PRIORITY, &result1, |
- callback1.callback(), &request1, BoundNetLog())); |
- ASSERT_EQ(ERR_IO_PENDING, |
- resolver_->Resolve(request_info2, DEFAULT_PRIORITY, &result2, |
- callback2.callback(), &request2, BoundNetLog())); |
+ ASSERT_EQ(ERR_IO_PENDING, resolver_->Resolve(request_info1, DEFAULT_PRIORITY, |
+ &result1, callback1.callback(), |
+ &request1, NetLogWithSource())); |
+ ASSERT_EQ(ERR_IO_PENDING, resolver_->Resolve(request_info2, DEFAULT_PRIORITY, |
+ &result2, callback2.callback(), |
+ &request2, NetLogWithSource())); |
EXPECT_THAT(callback1.GetResult(ERR_IO_PENDING), IsOk()); |
EXPECT_THAT(callback2.GetResult(ERR_IO_PENDING), |
IsError(ERR_NAME_NOT_RESOLVED)); |
@@ -322,7 +322,7 @@ TEST_F(HostResolverMojoTest, Cancel) { |
AddressList result; |
std::unique_ptr<HostResolver::Request> request; |
resolver_->Resolve(request_info, DEFAULT_PRIORITY, &result, base::Bind(&Fail), |
- &request, BoundNetLog()); |
+ &request, NetLogWithSource()); |
request.reset(); |
waiter_.WaitForEvent(ConnectionErrorSource::REQUEST); |
EXPECT_TRUE(result.empty()); |
@@ -355,8 +355,8 @@ TEST_F(HostResolverMojoTest, ResolveFromCache_Miss) { |
HostResolver::RequestInfo request_info( |
HostPortPair::FromString("example.com:8080")); |
AddressList result; |
- EXPECT_EQ(ERR_DNS_CACHE_MISS, |
- resolver_->ResolveFromCache(request_info, &result, BoundNetLog())); |
+ EXPECT_EQ(ERR_DNS_CACHE_MISS, resolver_->ResolveFromCache( |
+ request_info, &result, NetLogWithSource())); |
EXPECT_TRUE(result.empty()); |
} |
@@ -374,8 +374,8 @@ TEST_F(HostResolverMojoTest, ResolveFromCache_Hit) { |
EXPECT_EQ(1u, mock_resolver_->requests().size()); |
result.clear(); |
- EXPECT_EQ(OK, |
- resolver_->ResolveFromCache(request_info, &result, BoundNetLog())); |
+ EXPECT_EQ(OK, resolver_->ResolveFromCache(request_info, &result, |
+ NetLogWithSource())); |
ASSERT_EQ(2u, result.size()); |
EXPECT_EQ(address_list[0], result[0]); |
EXPECT_EQ(address_list[1], result[1]); |
@@ -397,8 +397,8 @@ TEST_F(HostResolverMojoTest, ResolveFromCache_CacheNotAllowed) { |
result.clear(); |
request_info.set_allow_cached_response(false); |
- EXPECT_EQ(ERR_DNS_CACHE_MISS, |
- resolver_->ResolveFromCache(request_info, &result, BoundNetLog())); |
+ EXPECT_EQ(ERR_DNS_CACHE_MISS, resolver_->ResolveFromCache( |
+ request_info, &result, NetLogWithSource())); |
EXPECT_TRUE(result.empty()); |
} |