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

Unified Diff: net/proxy/init_proxy_resolver_unittest.cc

Issue 1783008: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Sync Created 10 years, 8 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/proxy/init_proxy_resolver.cc ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/init_proxy_resolver_unittest.cc
===================================================================
--- net/proxy/init_proxy_resolver_unittest.cc (revision 45843)
+++ net/proxy/init_proxy_resolver_unittest.cc (working copy)
@@ -171,9 +171,9 @@
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(OK, init.Init(config, &callback, log.bound()));
+ CapturingNetLog log(CapturingNetLog::kUnbounded);
+ InitProxyResolver init(&resolver, &fetcher, &log);
+ EXPECT_EQ(OK, init.Init(config, &callback));
EXPECT_EQ(rule.bytes(), resolver.pac_bytes());
// Check the NetLog was filled correctly.
@@ -204,9 +204,9 @@
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(kFailedDownloading, init.Init(config, &callback, log.bound()));
+ CapturingNetLog log(CapturingNetLog::kUnbounded);
+ InitProxyResolver init(&resolver, &fetcher, &log);
+ EXPECT_EQ(kFailedDownloading, init.Init(config, &callback));
EXPECT_EQ("", resolver.pac_bytes());
// Check the NetLog was filled correctly.
@@ -233,8 +233,8 @@
rules.AddFailParsingRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(kFailedParsing, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(kFailedParsing, init.Init(config, &callback));
EXPECT_EQ("", resolver.pac_bytes());
}
@@ -247,8 +247,8 @@
config.set_pac_url(GURL("http://custom/proxy.pac"));
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, NULL);
- EXPECT_EQ(ERR_UNEXPECTED, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, NULL, NULL);
+ EXPECT_EQ(ERR_UNEXPECTED, init.Init(config, &callback));
EXPECT_EQ("", resolver.pac_bytes());
}
@@ -264,8 +264,8 @@
Rules::Rule rule = rules.AddSuccessRule("http://wpad/wpad.dat");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(OK, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(OK, init.Init(config, &callback));
EXPECT_EQ(rule.bytes(), resolver.pac_bytes());
}
@@ -283,8 +283,8 @@
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(OK, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(OK, init.Init(config, &callback));
EXPECT_EQ(rule.bytes(), resolver.pac_bytes());
}
@@ -302,9 +302,9 @@
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(OK, init.Init(config, &callback, log.bound()));
+ CapturingNetLog log(CapturingNetLog::kUnbounded);
+ InitProxyResolver init(&resolver, &fetcher, &log);
+ EXPECT_EQ(OK, init.Init(config, &callback));
EXPECT_EQ(rule.bytes(), resolver.pac_bytes());
// Check the NetLog was filled correctly.
@@ -351,8 +351,8 @@
rules.AddFailDownloadRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(kFailedDownloading, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(kFailedDownloading, init.Init(config, &callback));
EXPECT_EQ("", resolver.pac_bytes());
}
@@ -370,8 +370,8 @@
rules.AddFailParsingRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(kFailedParsing, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(kFailedParsing, init.Init(config, &callback));
EXPECT_EQ("", resolver.pac_bytes());
}
@@ -391,8 +391,8 @@
Rules::Rule rule = rules.AddSuccessRule("http://custom/proxy.pac");
TestCompletionCallback callback;
- InitProxyResolver init(&resolver, &fetcher);
- EXPECT_EQ(OK, init.Init(config, &callback, NULL));
+ InitProxyResolver init(&resolver, &fetcher, NULL);
+ EXPECT_EQ(OK, init.Init(config, &callback));
EXPECT_EQ(rule.url, resolver.pac_url());
}
« no previous file with comments | « net/proxy/init_proxy_resolver.cc ('k') | net/proxy/proxy_resolver_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698