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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_resolver_v8_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/proxy_resolver_v8.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_v8_unittest.cc
===================================================================
--- net/proxy/proxy_resolver_v8_unittest.cc (revision 45843)
+++ net/proxy/proxy_resolver_v8_unittest.cc (working copy)
@@ -138,7 +138,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_TRUE(proxy_info.is_direct());
@@ -158,7 +159,7 @@
{
ProxyInfo proxy_info;
result = resolver.GetProxyForURL(GURL("http://query.com/path"),
- &proxy_info, NULL, NULL, NULL);
+ &proxy_info, NULL, NULL, BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_EQ("http.query.com.path.query.com:80",
proxy_info.proxy_server().ToURI());
@@ -166,7 +167,8 @@
{
ProxyInfo proxy_info;
int result = resolver.GetProxyForURL(GURL("ftp://query.com:90/path"),
- &proxy_info, NULL, NULL, NULL);
+ &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
// Note that FindProxyForURL(url, host) does not expect |host| to contain
// the port number.
@@ -204,7 +206,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result);
@@ -224,7 +227,8 @@
EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_FAILED, result);
}
@@ -236,7 +240,8 @@
EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_FAILED, result);
@@ -259,7 +264,8 @@
// The PAC script increments a counter each time we invoke it.
for (int i = 0; i < 3; ++i) {
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_EQ(StringPrintf("sideffect_%d:80", i),
proxy_info.proxy_server().ToURI());
@@ -272,7 +278,8 @@
for (int i = 0; i < 3; ++i) {
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_EQ(StringPrintf("sideffect_%d:80", i),
proxy_info.proxy_server().ToURI());
@@ -286,7 +293,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result);
@@ -306,7 +314,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
// The result from this resolve was unparseable, because it
// wasn't ascii.
@@ -320,7 +329,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
// If the javascript side of this unit-test fails, it will throw a javascript
// exception. Otherwise it will return "PROXY success:80".
@@ -338,7 +348,8 @@
ProxyInfo proxy_info;
// Resolve should fail, as we are not yet initialized with a script.
- int result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ int result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_FAILED, result);
// Initialize it.
@@ -346,20 +357,23 @@
EXPECT_EQ(OK, result);
// Resolve should now succeed.
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
// Clear it, by initializing with an empty string.
resolver.SetPacScriptByData(std::string(), NULL);
// Resolve should fail again now.
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_FAILED, result);
// Load a good script once more.
result = resolver.SetPacScriptFromDisk("direct.js");
EXPECT_EQ(OK, result);
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_EQ(0U, resolver.mock_js_bindings()->alerts.size());
@@ -373,7 +387,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_TRUE(proxy_info.is_direct());
@@ -430,7 +445,8 @@
EXPECT_EQ(1, bindings->my_ip_address_count);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_FALSE(proxy_info.is_direct());
@@ -528,7 +544,8 @@
EXPECT_EQ(OK, result);
ProxyInfo proxy_info;
- result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, NULL);
+ result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, result);
EXPECT_FALSE(proxy_info.is_direct());
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698