diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 15:07:50 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 15:07:50 +0000 |
| commit | ab501a6a67596eb43d233f91f7500779dcbe8740 (patch) | |
| tree | 90bfc9f94bf80c4ed7081d8d54454f02075c3c26 /net/url_request | |
| parent | 481fe3bfb2359849d1d3fc9d0ceba4161fbb5a3e (diff) | |
| download | chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.zip chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.tar.gz chromium_src-ab501a6a67596eb43d233f91f7500779dcbe8740.tar.bz2 | |
Making command-line specified proxy settings more flexible - allowing for setting of auto-detect, pac url, per-schema proxy settings, proxy bypass urls.
BUG=http://crbug.com/266
Review URL: http://codereview.chromium.org/115029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_unittest.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index e661153..37e6439 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -48,9 +48,9 @@ class TestURLRequestContext : public URLRequestContext { } explicit TestURLRequestContext(const std::string& proxy) { - net::ProxyInfo proxy_info; - proxy_info.UseNamedProxy(proxy); - proxy_service_ = net::ProxyService::Create(&proxy_info); + net::ProxyConfig proxy_config; + proxy_config.proxy_rules.ParseFromString(proxy); + proxy_service_ = net::ProxyService::Create(&proxy_config); http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(proxy_service_); } @@ -548,7 +548,6 @@ class FTPTestServer : public BaseTestServer { return true; } - }; #endif // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_ |