Index: net/proxy/proxy_service_mojo_unittest.cc |
diff --git a/net/proxy/proxy_service_mojo_unittest.cc b/net/proxy/proxy_service_mojo_unittest.cc |
index 5dd94b00cfb7862b802aaf7a232eb4adf90de927..6881a196fd8c7f555e4fccb609d9cb559ff74650 100644 |
--- a/net/proxy/proxy_service_mojo_unittest.cc |
+++ b/net/proxy/proxy_service_mojo_unittest.cc |
@@ -149,45 +149,45 @@ class ProxyServiceMojoTest : public testing::Test, |
MockProxyScriptFetcher* fetcher_; // Owned by |proxy_service_|. |
TestNetLog net_log_; |
TestClosure on_delete_closure_; |
scoped_ptr<ProxyService> proxy_service_; |
}; |
TEST_F(ProxyServiceMojoTest, Basic) { |
ProxyInfo info; |
TestCompletionCallback callback; |
EXPECT_EQ(ERR_IO_PENDING, |
- proxy_service_->ResolveProxy(GURL("http://foo"), LOAD_NORMAL, &info, |
- callback.callback(), nullptr, nullptr, |
- BoundNetLog())); |
+ proxy_service_->ResolveProxy( |
+ GURL("http://foo"), std::string(), LOAD_NORMAL, &info, |
+ callback.callback(), nullptr, nullptr, BoundNetLog())); |
// Proxy script fetcher should have a fetch triggered by the first |
// |ResolveProxy()| request. |
EXPECT_TRUE(fetcher_->has_pending_request()); |
EXPECT_EQ(GURL(kPacUrl), fetcher_->pending_request_url()); |
fetcher_->NotifyFetchCompletion(OK, kSimplePacScript); |
EXPECT_EQ(OK, callback.WaitForResult()); |
EXPECT_EQ("PROXY foo:1234", info.ToPacString()); |
EXPECT_EQ(0u, mock_host_resolver_.num_resolve()); |
proxy_service_.reset(); |
on_delete_closure_.WaitForResult(); |
} |
TEST_F(ProxyServiceMojoTest, DnsResolution) { |
ProxyInfo info; |
TestCompletionCallback callback; |
BoundTestNetLog bound_net_log; |
EXPECT_EQ(ERR_IO_PENDING, |
- proxy_service_->ResolveProxy(GURL("http://foo"), LOAD_NORMAL, &info, |
- callback.callback(), nullptr, nullptr, |
- bound_net_log.bound())); |
+ proxy_service_->ResolveProxy( |
+ GURL("http://foo"), std::string(), LOAD_NORMAL, &info, |
+ callback.callback(), nullptr, nullptr, bound_net_log.bound())); |
// Proxy script fetcher should have a fetch triggered by the first |
// |ResolveProxy()| request. |
EXPECT_TRUE(fetcher_->has_pending_request()); |
EXPECT_EQ(GURL(kPacUrl), fetcher_->pending_request_url()); |
fetcher_->NotifyFetchCompletion(OK, kDnsResolvePacScript); |
EXPECT_EQ(OK, callback.WaitForResult()); |
EXPECT_EQ("QUIC bar:4321", info.ToPacString()); |
EXPECT_EQ(1u, mock_host_resolver_.num_resolve()); |
@@ -202,23 +202,23 @@ TEST_F(ProxyServiceMojoTest, DnsResolution) { |
return entry.type == |
NetLog::TYPE_HOST_RESOLVER_IMPL_JOB; |
})); |
} |
TEST_F(ProxyServiceMojoTest, Error) { |
ProxyInfo info; |
TestCompletionCallback callback; |
BoundTestNetLog bound_net_log; |
EXPECT_EQ(ERR_IO_PENDING, |
- proxy_service_->ResolveProxy(GURL("http://foo"), LOAD_NORMAL, &info, |
- callback.callback(), nullptr, nullptr, |
- bound_net_log.bound())); |
+ proxy_service_->ResolveProxy( |
+ GURL("http://foo"), std::string(), LOAD_NORMAL, &info, |
+ callback.callback(), nullptr, nullptr, bound_net_log.bound())); |
// Proxy script fetcher should have a fetch triggered by the first |
// |ResolveProxy()| request. |
EXPECT_TRUE(fetcher_->has_pending_request()); |
EXPECT_EQ(GURL(kPacUrl), fetcher_->pending_request_url()); |
fetcher_->NotifyFetchCompletion(OK, kThrowingPacScript); |
network_delegate_.event_waiter().WaitForEvent( |
TestNetworkDelegate::PAC_SCRIPT_ERROR); |
@@ -231,23 +231,23 @@ TEST_F(ProxyServiceMojoTest, Error) { |
CheckCapturedNetLogEntries(entries); |
entries.clear(); |
net_log_.GetEntries(&entries); |
CheckCapturedNetLogEntries(entries); |
} |
TEST_F(ProxyServiceMojoTest, ErrorOnInitialization) { |
ProxyInfo info; |
TestCompletionCallback callback; |
EXPECT_EQ(ERR_IO_PENDING, |
- proxy_service_->ResolveProxy(GURL("http://foo"), LOAD_NORMAL, &info, |
- callback.callback(), nullptr, nullptr, |
- BoundNetLog())); |
+ proxy_service_->ResolveProxy( |
+ GURL("http://foo"), std::string(), LOAD_NORMAL, &info, |
+ callback.callback(), nullptr, nullptr, BoundNetLog())); |
// Proxy script fetcher should have a fetch triggered by the first |
// |ResolveProxy()| request. |
EXPECT_TRUE(fetcher_->has_pending_request()); |
EXPECT_EQ(GURL(kPacUrl), fetcher_->pending_request_url()); |
fetcher_->NotifyFetchCompletion(OK, kThrowingOnLoadPacScript); |
network_delegate_.event_waiter().WaitForEvent( |
TestNetworkDelegate::PAC_SCRIPT_ERROR); |