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

Unified Diff: net/proxy/proxy_resolver_perftest.cc

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 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_mac.h ('k') | net/proxy/proxy_resolver_v8.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_perftest.cc
===================================================================
--- net/proxy/proxy_resolver_perftest.cc (revision 22399)
+++ net/proxy/proxy_resolver_perftest.cc (working copy)
@@ -97,7 +97,8 @@
InitHttpServer();
GURL pac_url =
server_->TestServerPage(std::string("files/") + script_name);
- resolver_->SetPacScriptByUrl(pac_url);
+ int rv = resolver_->SetPacScriptByUrl(pac_url, NULL);
+ EXPECT_EQ(net::OK, rv);
} else {
LoadPacScriptIntoResolver(script_name);
}
@@ -163,7 +164,8 @@
ASSERT_TRUE(ok);
// Load the PAC script into the ProxyResolver.
- resolver_->SetPacScriptByData(file_contents);
+ int rv = resolver_->SetPacScriptByData(file_contents, NULL);
+ EXPECT_EQ(net::OK, rv);
}
net::ProxyResolver* resolver_;
« no previous file with comments | « net/proxy/proxy_resolver_mac.h ('k') | net/proxy/proxy_resolver_v8.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698