Remove the concept of threading from ProxyService, and move it into the Proxy...

net/proxy/proxy_resolver_v8.cc

 // Copyright (c) 2009 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_resolver_v8.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/waitable_event.h"
@@ skipping 326 matching lines @@
 
   JSBindings* js_bindings_;
   v8::Persistent<v8::External> v8_this_;
   v8::Persistent<v8::Context> v8_context_;
 };
 
 // ProxyResolverV8 ------------------------------------------------------------
 
 ProxyResolverV8::ProxyResolverV8(
     ProxyResolverV8::JSBindings* custom_js_bindings)
-    : ProxyResolver(false), js_bindings_(custom_js_bindings) {
+    : ProxyResolver(true /*expects_pac_bytes*/),
+      js_bindings_(custom_js_bindings) {
 }
 
 ProxyResolverV8::~ProxyResolverV8() {}
 
 int ProxyResolverV8::GetProxyForURL(const GURL& query_url,
-                                    const GURL& /*pac_url*/,
-                                    ProxyInfo* results) {
-  // If the V8 instance has not been initialized (either because SetPacScript()
-  // wasn't called yet, or because it was called with empty string).
+                                    ProxyInfo* results,
+                                    CompletionCallback* /*callback*/,
+                                    RequestHandle* /*request*/) {
+  // If the V8 instance has not been initialized (either because
+  // SetPacScriptByData() wasn't called yet, or because it was called with
+  // empty string).
   if (!context_.get())
     return ERR_FAILED;
 
   // Otherwise call into V8.
   return context_->ResolveProxy(query_url, results);
 }
 
-void ProxyResolverV8::SetPacScript(const std::string& data) {
-  context_.reset();
-  if (!data.empty())
-    context_.reset(new Context(js_bindings_.get(), data));
+void ProxyResolverV8::CancelRequest(RequestHandle request) {
+  // This is a synchronous ProxyResolver; no possibility for async requests.
+  NOTREACHED();
 }
 
 // static
 ProxyResolverV8::JSBindings* ProxyResolverV8::CreateDefaultBindings(
     HostResolver* host_resolver, MessageLoop* host_resolver_loop) {
   return new DefaultJSBindings(host_resolver, host_resolver_loop);
 }
 
+void ProxyResolverV8::SetPacScriptByDataInternal(const std::string& data) {
+  context_.reset();
+  if (!data.empty())
+    context_.reset(new Context(js_bindings_.get(), data));
+}
+
 }  // namespace net