Chromium Code Reviews| 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..44521942f1f6d32c40d76dc81ea134facef97495 100644 |
| --- a/net/proxy/proxy_service_mojo_unittest.cc |
| +++ b/net/proxy/proxy_service_mojo_unittest.cc |
| @@ -151,21 +151,21 @@ class ProxyServiceMojoTest : public testing::Test, |
| 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())); |
| + "", BoundNetLog())); |
|
bengr
2016/02/16 20:00:14
std::string(). Ditto for line 183, 214, and 243.
|
| // 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()); |
| @@ -173,21 +173,21 @@ TEST_F(ProxyServiceMojoTest, Basic) { |
| 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())); |
| + "", 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()); |
| @@ -204,21 +204,21 @@ TEST_F(ProxyServiceMojoTest, DnsResolution) { |
| })); |
| } |
| 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())); |
| + "", 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); |
| @@ -233,21 +233,21 @@ TEST_F(ProxyServiceMojoTest, Error) { |
| 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())); |
| + "", 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); |