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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« net/base/mime_util_unittest.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/quic/congestion_control/cube_root.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index bad5afd62c78f2ca32090d57dc99bbbd8f36cd14..2d5bdafd6d12826c8c1916b0516b68937709d8bc 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -35,7 +35,8 @@ class ImmediatePollPolicy : public ProxyService::PacPollPolicy {
public:
ImmediatePollPolicy() {}
- virtual Mode GetNextDelay(int error, base::TimeDelta current_delay,
+ virtual Mode GetNextDelay(int error,
+ base::TimeDelta current_delay,
base::TimeDelta* next_delay) const OVERRIDE {
*next_delay = base::TimeDelta::FromMilliseconds(1);
return MODE_USE_TIMER;
@@ -51,7 +52,8 @@ class NeverPollPolicy : public ProxyService::PacPollPolicy {
public:
NeverPollPolicy() {}
- virtual Mode GetNextDelay(int error, base::TimeDelta current_delay,
+ virtual Mode GetNextDelay(int error,
+ base::TimeDelta current_delay,
base::TimeDelta* next_delay) const OVERRIDE {
*next_delay = base::TimeDelta::FromDays(60);
return MODE_USE_TIMER;
@@ -66,7 +68,8 @@ class ImmediateAfterActivityPollPolicy : public ProxyService::PacPollPolicy {
public:
ImmediateAfterActivityPollPolicy() {}
- virtual Mode GetNextDelay(int error, base::TimeDelta current_delay,
+ virtual Mode GetNextDelay(int error,
+ base::TimeDelta current_delay,
base::TimeDelta* next_delay) const OVERRIDE {
*next_delay = base::TimeDelta();
return MODE_START_AFTER_ACTIVITY;
@@ -113,17 +116,14 @@ class ProxyServiceTest : public testing::Test {
const char kValidPacScript1[] = "pac-script-v1-FindProxyForURL";
const char kValidPacScript2[] = "pac-script-v2-FindProxyForURL";
-class MockProxyConfigService: public ProxyConfigService {
+class MockProxyConfigService : public ProxyConfigService {
public:
explicit MockProxyConfigService(const ProxyConfig& config)
- : availability_(CONFIG_VALID),
- config_(config) {
- }
+ : availability_(CONFIG_VALID), config_(config) {}
explicit MockProxyConfigService(const std::string& pac_url)
: availability_(CONFIG_VALID),
- config_(ProxyConfig::CreateFromCustomPacURL(GURL(pac_url))) {
- }
+ config_(ProxyConfig::CreateFromCustomPacURL(GURL(pac_url))) {}
virtual void AddObserver(Observer* observer) OVERRIDE {
observers_.AddObserver(observer);
@@ -133,8 +133,8 @@ class MockProxyConfigService: public ProxyConfigService {
observers_.RemoveObserver(observer);
}
- virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* results)
- OVERRIDE {
+ virtual ConfigAvailability GetLatestProxyConfig(
+ ProxyConfig* results) OVERRIDE {
if (availability_ == CONFIG_VALID)
*results = config_;
return availability_;
@@ -143,8 +143,8 @@ class MockProxyConfigService: public ProxyConfigService {
void SetConfig(const ProxyConfig& config) {
availability_ = CONFIG_VALID;
config_ = config;
- FOR_EACH_OBSERVER(Observer, observers_,
- OnProxyConfigChanged(config_, availability_));
+ FOR_EACH_OBSERVER(
+ Observer, observers_, OnProxyConfigChanged(config_, availability_));
}
private:
@@ -157,16 +157,16 @@ class MockProxyConfigService: public ProxyConfigService {
TEST_F(ProxyServiceTest, Direct) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
- ProxyService service(new MockProxyConfigService(
- ProxyConfig::CreateDirect()), resolver, NULL);
+ ProxyService service(
+ new MockProxyConfigService(ProxyConfig::CreateDirect()), resolver, NULL);
GURL url("http://www.google.com/");
ProxyInfo info;
TestCompletionCallback callback;
CapturingBoundNetLog log;
- int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, log.bound());
+ int rv =
+ service.ResolveProxy(url, &info, callback.callback(), NULL, log.bound());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(resolver->pending_requests().empty());
@@ -179,13 +179,12 @@ TEST_F(ProxyServiceTest, Direct) {
log.GetEntries(&entries);
EXPECT_EQ(3u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SERVICE));
- EXPECT_TRUE(LogContainsEvent(
- entries, 1, NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsEvent(entries,
+ 1,
+ NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
+ NetLog::PHASE_NONE));
+ EXPECT_TRUE(LogContainsEndEvent(entries, 2, NetLog::TYPE_PROXY_SERVICE));
}
TEST_F(ProxyServiceTest, PAC) {
@@ -234,14 +233,12 @@ TEST_F(ProxyServiceTest, PAC) {
log.GetEntries(&entries);
EXPECT_EQ(5u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SERVICE));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 1, NetLog::TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC));
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 4, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsEndEvent(entries, 4, NetLog::TYPE_PROXY_SERVICE));
}
// Test that the proxy resolver does not see the URL's username/password
@@ -269,7 +266,7 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) {
ASSERT_EQ(1u, resolver->pending_requests().size());
// The URL should have been simplified, stripping the username/password/hash.
EXPECT_EQ(GURL("http://www.google.com/?ref"),
- resolver->pending_requests()[0]->url());
+ resolver->pending_requests()[0]->url());
// We end here without ever completing the request -- destruction of
// ProxyService will cancel the outstanding request.
@@ -410,31 +407,31 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
// Fallback 1.
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foobar:10", info.proxy_server().ToURI());
// Fallback 2.
TestCompletionCallback callback3;
- rv = service.ReconsiderProxyAfterError(url, &info, callback3.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info.is_direct());
// Fallback 3.
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info, callback4.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback4.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foobar:20", info.proxy_server().ToURI());
// Fallback 4 -- Nothing to fall back to!
TestCompletionCallback callback5;
- rv = service.ReconsiderProxyAfterError(url, &info, callback5.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback5.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_FAILED, rv);
EXPECT_TRUE(info.is_empty());
}
@@ -618,8 +615,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) {
// Since ProxyScriptDecider failed to identify a valid PAC and PAC was
// mandatory for this configuration, the ProxyService must not implicitly
// fall-back to DIRECT.
- EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED,
- callback.WaitForResult());
+ EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED, callback.WaitForResult());
EXPECT_FALSE(info.is_direct());
}
@@ -728,8 +724,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// Fake an error on the proxy.
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// Proxy times should not have been modified by fallback.
@@ -770,8 +766,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// We fake another error. It should now try the third one.
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info, callback4.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback4.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI());
@@ -779,16 +775,16 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// proxy servers we thought were valid; next we try the proxy server
// that was in our bad proxies map (foopy1:8080).
TestCompletionCallback callback5;
- rv = service.ReconsiderProxyAfterError(url, &info, callback5.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback5.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
// Fake another error, the last proxy is gone, the list should now be empty,
// so there is nothing left to try.
TestCompletionCallback callback6;
- rv = service.ReconsiderProxyAfterError(url, &info, callback6.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback6.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_FAILED, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_TRUE(info.is_empty());
@@ -799,8 +795,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// Look up proxies again
TestCompletionCallback callback7;
- rv = service.ResolveProxy(url, &info, callback7.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(
+ url, &info, callback7.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -861,8 +857,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
// Fake an error on the proxy.
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// Now we get back the second proxy.
@@ -870,8 +866,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
// Fake an error on this proxy as well.
TestCompletionCallback callback3;
- rv = service.ReconsiderProxyAfterError(url, &info, callback3.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// Finally, we get back DIRECT.
@@ -883,8 +879,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
// Now we tell the proxy service that even DIRECT failed.
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info, callback4.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback4.callback(), NULL, BoundNetLog());
// There was nothing left to try after DIRECT, so we are out of
// choices.
EXPECT_EQ(ERR_FAILED, rv);
@@ -931,8 +927,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
ProxyConfig::CreateFromCustomPacURL(GURL("http://foopy-new/proxy.pac")));
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy-new/proxy.pac"),
@@ -952,20 +948,19 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
// We fake another error. It should now ignore the first one.
TestCompletionCallback callback3;
- rv = service.ReconsiderProxyAfterError(url, &info, callback3.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI());
// We simulate a new configuration.
config_service->SetConfig(
- ProxyConfig::CreateFromCustomPacURL(
- GURL("http://foopy-new2/proxy.pac")));
+ ProxyConfig::CreateFromCustomPacURL(GURL("http://foopy-new2/proxy.pac")));
// We fake another error. It should go back to the first proxy.
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info, callback4.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback4.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy-new2/proxy.pac"),
@@ -1023,8 +1018,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
// Fake a proxy error.
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// The first proxy is ignored, and the second one is selected.
@@ -1055,8 +1050,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
// "just work" the next time we call it.
ProxyInfo info3;
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info3, callback4.callback(),
- NULL, BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info3, callback4.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1116,8 +1111,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
// Fake a proxy error.
TestCompletionCallback callback2;
- rv = service.ReconsiderProxyAfterError(url, &info, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
// The first proxy is ignored, and the second one is selected.
@@ -1149,8 +1144,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
// "just work" the next time we call it.
ProxyInfo info3;
TestCompletionCallback callback4;
- rv = service.ReconsiderProxyAfterError(url, &info3, callback4.callback(),
- NULL, BoundNetLog());
+ rv = service.ReconsiderProxyAfterError(
+ url, &info3, callback4.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1197,7 +1192,6 @@ TEST_F(ProxyServiceTest, ProxyBypassList) {
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI());
}
-
TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
ProxyConfig config;
config.proxy_rules().ParseFromString("http=foopy1:8080;https=foopy2:8080");
@@ -1208,8 +1202,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1220,8 +1214,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info.is_direct());
EXPECT_EQ("direct://", info.proxy_server().ToURI());
@@ -1232,8 +1226,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
@@ -1245,8 +1239,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("http://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1266,8 +1260,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("http://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// Should be SOURCE_TEST, even if there are no HTTP proxies configured.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1281,8 +1275,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("https://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// Used the HTTPS proxy. So source should be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1295,8 +1289,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("http://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// ProxyConfig is empty. Source should still be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1318,8 +1312,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1330,8 +1324,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1342,8 +1336,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1354,8 +1348,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("unknown://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(
+ test_url, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1375,8 +1369,11 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the proxy resolver yet, since the proxy
@@ -1394,16 +1391,22 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(2u, resolver->pending_requests().size());
EXPECT_EQ(GURL("http://request2"), resolver->pending_requests()[1]->url());
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"),
+ &info3,
+ callback3.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(3u, resolver->pending_requests().size());
EXPECT_EQ(GURL("http://request3"), resolver->pending_requests()[2]->url());
@@ -1454,8 +1457,11 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info1;
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), &request1, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ &request1,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1465,15 +1471,21 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
ProxyService::PacRequest* request3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), &request3, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"),
+ &info3,
+ callback3.callback(),
+ &request3,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the resolver yet.
@@ -1556,8 +1568,11 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1566,8 +1581,11 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// At this point the ProxyService should be waiting for the
@@ -1616,8 +1634,11 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
CapturingBoundNetLog log1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), &request1, log1.bound());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ &request1,
+ log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1627,14 +1648,20 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"),
+ &info3,
+ callback3.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the resolver yet.
@@ -1675,16 +1702,14 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
// Check the NetLog for request 1 (which was cancelled) got filled properly.
EXPECT_EQ(4u, entries1.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries1, 0, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsBeginEvent(entries1, 0, NetLog::TYPE_PROXY_SERVICE));
EXPECT_TRUE(LogContainsBeginEvent(
entries1, 1, NetLog::TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC));
// Note that TYPE_PROXY_SERVICE_WAITING_FOR_INIT_PAC is never completed before
// the cancellation occured.
EXPECT_TRUE(LogContainsEvent(
entries1, 2, NetLog::TYPE_CANCELLED, NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEndEvent(
- entries1, 3, NetLog::TYPE_PROXY_SERVICE));
+ EXPECT_TRUE(LogContainsEndEvent(entries1, 3, NetLog::TYPE_PROXY_SERVICE));
}
// Test that if auto-detect fails, we fall-back to the custom pac.
@@ -1707,15 +1732,21 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1784,15 +1815,21 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1857,15 +1894,21 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1915,9 +1958,11 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://www.google.com"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://www.google.com"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1947,8 +1992,11 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
// Start another request, it should pickup the bypass item.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://www.google.com"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://www.google.com"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1969,7 +2017,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
// being deleted prior to the InitProxyResolver).
TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
ProxyConfig config =
- ProxyConfig::CreateFromCustomPacURL(GURL("http://foopy/proxy.pac"));
+ ProxyConfig::CreateFromCustomPacURL(GURL("http://foopy/proxy.pac"));
MockProxyConfigService* config_service = new MockProxyConfigService(config);
MockAsyncProxyResolverExpectsBytes* resolver =
@@ -1984,8 +2032,11 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://www.google.com"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -2025,14 +2076,17 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
ProxyConfig config1;
config1.proxy_rules().ParseFromString("foopy1:8080");
config1.set_auto_detect(false);
- ProxyService service(
- new MockProxyConfigService(config1),
- new MockAsyncProxyResolverExpectsBytes, NULL);
+ ProxyService service(new MockProxyConfigService(config1),
+ new MockAsyncProxyResolverExpectsBytes,
+ NULL);
ProxyInfo info;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -2041,8 +2095,11 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
config2.set_auto_detect(false);
service.ResetConfigService(new MockProxyConfigService(config2));
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
}
@@ -2060,8 +2117,11 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://www.google.com"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -2091,8 +2151,11 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
// Start another request -- the effective configuration has changed.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://www.google.com"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://www.google.com"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info2.is_direct());
@@ -2121,8 +2184,11 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2163,8 +2229,11 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// This second request should have triggered the re-download of the PAC
@@ -2202,8 +2271,8 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
CapturingNetLog::CapturedEntryList entries;
log.GetEntries(&entries);
- EXPECT_TRUE(LogContainsEntryWithType(entries, 0,
- NetLog::TYPE_PROXY_CONFIG_CHANGED));
+ EXPECT_TRUE(
+ LogContainsEntryWithType(entries, 0, NetLog::TYPE_PROXY_CONFIG_CHANGED));
ASSERT_EQ(9u, entries.size());
for (size_t i = 1; i < entries.size(); ++i)
EXPECT_NE(NetLog::TYPE_PROXY_CONFIG_CHANGED, entries[i].type);
@@ -2235,9 +2304,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(),
- NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2296,9 +2367,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2340,9 +2413,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2406,9 +2481,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2450,9 +2527,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2512,9 +2591,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2556,9 +2637,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2616,9 +2699,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info2.is_direct());
}
@@ -2708,9 +2793,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"),
+ &info1,
+ callback1.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2752,9 +2839,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"),
+ &info2,
+ callback2.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// This request should have sent work to the resolver; complete it.
@@ -2783,9 +2872,11 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
// since the PAC script poller experienced a failure.
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(
- GURL("http://request3"), &info3, callback3.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"),
+ &info3,
+ callback3.callback(),
+ NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info3.is_direct());
}
« net/base/mime_util_unittest.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/quic/congestion_control/cube_root.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698