diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 8 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 81af0d4..ce76e69 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -43,7 +43,7 @@ static net::ProxyService* CreateProxyService(URLRequestContext* context, const CommandLine& command_line) { scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line)); - bool use_v8 = command_line.HasSwitch(switches::kV8ProxyResolver); + bool use_v8 = !command_line.HasSwitch(switches::kWinHttpProxyResolver); if (use_v8 && command_line.HasSwitch(switches::kSingleProcess)) { // See the note about V8 multithreading in net/proxy/proxy_resolver_v8.h // to understand why we have this limitation. @@ -52,8 +52,8 @@ static net::ProxyService* CreateProxyService(URLRequestContext* context, } return use_v8 ? - net::ProxyService::CreateUsingV8Resolver(proxy_info.get(), context) : - net::ProxyService::Create(proxy_info.get()); + net::ProxyService::CreateUsingV8Resolver(proxy_info.get(), context) : + net::ProxyService::Create(proxy_info.get()); } // static diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index c32cbb5..c12b578 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -233,11 +233,9 @@ const wchar_t kMakeDefaultBrowser[] = L"make-default-browser"; // affects HTTP and HTTPS requests. const wchar_t kProxyServer[] = L"proxy-server"; -// Enable alternate proxy autoconfig implementation, which downloads PAC -// scripts internally and executes them using V8 (as opposed to fetching -// and executing using WinHTTP). This cannot be used in conjunction with -// --single-process. -const wchar_t kV8ProxyResolver[] = L"v8-proxy-resolver"; +// Use WinHTTP to fetch and evaluate PAC scripts. Otherwise the default is +// to use Chromium's network stack to fetch, and V8 to evaluate. +const wchar_t kWinHttpProxyResolver[] = L"winhttp-proxy-resolver"; // Chrome will support prefetching of DNS information. Until this becomes // the default, we'll provide a command line switch. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 8b51a7d..fb72d4f 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -78,7 +78,7 @@ extern const wchar_t kShowIcons[]; extern const wchar_t kMakeDefaultBrowser[]; extern const wchar_t kProxyServer[]; -extern const wchar_t kV8ProxyResolver[]; +extern const wchar_t kWinHttpProxyResolver[]; extern const wchar_t kDebugPrint[]; extern const wchar_t kDnsLogDetails[]; |