Add a command line flag --v8-proxy-resolver, to select the new PAC implementa...

net/proxy/proxy_service.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_service.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #if defined(OS_WIN)
 #include "net/proxy/proxy_config_service_win.h"
 #include "net/proxy/proxy_resolver_winhttp.h"
 #elif defined(OS_MACOSX)
 #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;
 
 namespace net {
 
 // Config getter that fails every time.
 class ProxyConfigServiceNull : public ProxyConfigService {
  public:
   virtual int GetProxyConfig(ProxyConfig* config) {
@@ skipping 173 matching lines @@
   // TODO(port): implement ProxyConfigServiceLinux as well as make use of
   // ProxyResolverV8 once it's implemented.
   // See:
   // - http://code.google.com/p/chromium/issues/detail?id=8143
   // - http://code.google.com/p/chromium/issues/detail?id=2764
   return CreateNull();
 #endif
 }
 
 // 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).
   return new ProxyService(new ProxyConfigServiceNull, NULL);
 }
 
 int ProxyService::ResolveProxy(const GURL& url, ProxyInfo* result,
                                CompletionCallback* callback,
                                PacRequest** pac_request) {
   DCHECK(callback);
@@ skipping 402 matching lines @@
   }
 }
 
 void SyncProxyServiceHelper::OnCompletion(int rv) {
   result_ = rv;
   event_.Signal();
 }
 
 }  // namespace net