diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:43:12 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:43:12 +0000 |
| commit | 620f57148c311c4dc2cf680a4a5861fbdcd29993 (patch) | |
| tree | 93408ed35ebbaccd8f45734c7267392c81d71ca9 /net/proxy/proxy_resolver_perftest.cc | |
| parent | 289fdf862c649d17ddb2e08295304efb98f641f6 (diff) | |
| download | chromium_src-620f57148c311c4dc2cf680a4a5861fbdcd29993.zip chromium_src-620f57148c311c4dc2cf680a4a5861fbdcd29993.tar.gz chromium_src-620f57148c311c4dc2cf680a4a5861fbdcd29993.tar.bz2 | |
Better match IE's proxy settings.
* When BOTH autodetect and custom PAC script are given, try both.
* Use successful PAC parsing as the heuristic for determining when a script is valid (rather than first-request).
* Only apply the proxy bypass list when using non-PAC.
The high level explanation on how this works:
http://sites.google.com/a/chromium.org/dev/developers/design-documents/proxy-settings-fallback
BUG= http://crbug.com/18271, http://crbug.com/9985
TEST=unit tests.
Review URL: http://codereview.chromium.org/160510
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_perftest.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_perftest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index cb20ff9..efaf437 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -97,7 +97,8 @@ class PacPerfSuiteRunner { 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 @@ class PacPerfSuiteRunner { 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_; |