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

net/proxy/proxy_resolver_mac.h

 // Copyright (c) 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.
 
 #ifndef NET_PROXY_PROXY_RESOLVER_MAC_H_
 #define NET_PROXY_PROXY_RESOLVER_MAC_H_
 
+#include <string>
+
+#include "googleurl/src/gurl.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_resolver.h"
 
 namespace net {
 
 // Implementation of ProxyResolver that uses the Mac CFProxySupport to implement
 // proxies.
 class ProxyResolverMac : public ProxyResolver {
  public:
-  ProxyResolverMac() : ProxyResolver(true) {}
+  ProxyResolverMac() : ProxyResolver(false /*expects_pac_bytes*/) {}
 
   // ProxyResolver methods:
-  virtual int GetProxyForURL(const GURL& query_url,
-                             const GURL& pac_url,
-                             ProxyInfo* results);
+  virtual int GetProxyForURL(const GURL& url,
+                             ProxyInfo* results,
+                             CompletionCallback* callback,
+                             RequestHandle* request);
+
+  virtual void CancelRequest(RequestHandle request) {
+    NOTREACHED();
+  }
+
+ private:
+  virtual void SetPacScriptByUrlInternal(const GURL& pac_url) {
+    pac_url_ = pac_url;
+  }
+
+  GURL pac_url_;
 };
 
 class ProxyConfigServiceMac : public ProxyConfigService {
  public:
   // ProxyConfigService methods:
   virtual int GetProxyConfig(ProxyConfig* config);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_RESOLVER_MAC_H_