summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 21:37:09 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 21:37:09 +0000
commit8699534623783eafa2f64a8bfe98c89bb561bb1a (patch)
tree3628efed1646013baa5ccef2ed99e4ba4b12ab3f /net/proxy/proxy_service.cc
parenta514488aafec0dd0eaba9e22e8b5ce0651cff1cd (diff)
downloadchromium_src-8699534623783eafa2f64a8bfe98c89bb561bb1a.zip
chromium_src-8699534623783eafa2f64a8bfe98c89bb561bb1a.tar.gz
chromium_src-8699534623783eafa2f64a8bfe98c89bb561bb1a.tar.bz2
Add a command line flag --v8-proxy-resolver, to select the new PAC implementation.
When running in single process mode, this flag has no effect (since we can't run side by side with the renderer's V8). In regular mode, the v8 resolver is currently running in the browser process. This means it has to share with the v8 debugger shell. Added locking around the debugger shell so they can peacefully co-exist. When this flag is enabled, PAC scripts are downloaded through the browser. BUG=74,2764 Review URL: http://codereview.chromium.org/27365 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc33
1 files changed, 33 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 14b60f6..443a46b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -21,6 +21,7 @@
#include "net/proxy/proxy_resolver_mac.h"
#endif
#include "net/proxy/proxy_resolver.h"
+#include "net/proxy/proxy_resolver_v8.h"
using base::TimeDelta;
using base::TimeTicks;
@@ -214,6 +215,38 @@ ProxyService* ProxyService::Create(const ProxyInfo* pi) {
}
// static
+ProxyService* ProxyService::CreateUsingV8Resolver(
+ const ProxyInfo* pi, URLRequestContext* url_request_context) {
+ if (pi) {
+ // The ProxyResolver is set to NULL, since it should never be called
+ // (because the configuration will never require PAC).
+ return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL);
+ }
+
+ // Choose the system configuration service appropriate for each platform.
+ ProxyConfigService* config_service;
+#if defined(OS_WIN)
+ config_service = new ProxyConfigServiceWin();
+#elif defined(OS_MACOSX)
+ config_service = new ProxyConfigServiceMac();
+#else
+ // TODO(port): implement ProxyConfigServiceLinux.
+ // See: http://code.google.com/p/chromium/issues/detail?id=8143
+ return CreateNull();
+#endif
+
+ // Create a ProxyService that uses V8 to evaluate PAC scripts.
+ ProxyService* proxy_service = new ProxyService(
+ config_service, new ProxyResolverV8());
+
+ // Configure PAC script downloads to be issued using |url_request_context|.
+ proxy_service->SetProxyScriptFetcher(
+ ProxyScriptFetcher::Create(url_request_context));
+
+ return proxy_service;
+}
+
+// static
ProxyService* ProxyService::CreateNull() {
// The ProxyResolver is set to NULL, since it should never be called
// (because the configuration will never require PAC).