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

Unified Diff: net/proxy/proxy_service.h

Issue 3646004: Add an option ProxyService::Create() to disable use of proxy auto-config.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix a typo Created 10 years, 2 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 | « chrome_frame/metrics_service.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.h
===================================================================
--- net/proxy/proxy_service.h (revision 62058)
+++ net/proxy/proxy_service.h (working copy)
@@ -137,8 +137,6 @@
// Creates a proxy service that polls |proxy_config_service| to notice when
// the proxy settings change. We take ownership of |proxy_config_service|.
- // Iff |use_v8_resolver| is true, then the V8 implementation is
- // used.
//
// |num_pac_threads| specifies the maximum number of threads to use for
// executing PAC scripts. Threads are created lazily on demand.
@@ -155,24 +153,34 @@
// (b) increases the memory used by proxy resolving, as each thread will
// duplicate its own script context.
- // |url_request_context| is only used when use_v8_resolver is true:
- // it specifies the URL request context that will be used if a PAC
- // script needs to be fetched.
- // |io_loop| points to the IO thread's message loop. It is only used
- // when pc is NULL.
+ // |url_request_context| specifies the URL request context that will
+ // be used if a PAC script needs to be fetched.
+ // |io_loop| points to the IO thread's message loop.
// ##########################################################################
// # See the warnings in net/proxy/proxy_resolver_v8.h describing the
// # multi-threading model. In order for this to be safe to use, *ALL* the
// # other V8's running in the process must use v8::Locker.
// ##########################################################################
- static ProxyService* Create(
+ static ProxyService* CreateUsingV8ProxyResolver(
ProxyConfigService* proxy_config_service,
- bool use_v8_resolver,
size_t num_pac_threads,
URLRequestContext* url_request_context,
NetLog* net_log,
MessageLoop* io_loop);
+ // Same as CreateUsingV8ProxyResolver, except it uses system libraries
+ // for evaluating the PAC script if available, otherwise skips
+ // proxy autoconfig.
+ static ProxyService* CreateUsingSystemProxyResolver(
+ ProxyConfigService* proxy_config_service,
+ size_t num_pac_threads,
+ NetLog* net_log);
+
+ // Creates a ProxyService without support for proxy autoconfig.
+ static ProxyService* CreateWithoutProxyResolver(
+ ProxyConfigService* proxy_config_service,
+ NetLog* net_log);
+
// Convenience method that creates a proxy service using the
// specified fixed settings. |pc| must not be NULL.
static ProxyService* CreateFixed(const ProxyConfig& pc);
« no previous file with comments | « chrome_frame/metrics_service.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698