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 /webkit/tools/test_shell | |
| 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 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 2597f77..6a58104 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -29,9 +29,8 @@ void TestShellRequestContext::Init( accept_language_ = "en-us,en"; accept_charset_ = "iso-8859-1,*,utf-8"; - net::ProxyInfo proxy_info; - proxy_info.UseDirect(); - proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_info : NULL); + net::ProxyConfig proxy_config; + proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL); net::HttpCache *cache; if (cache_path.empty()) { |