Index: net/proxy/proxy_resolver_mac.cc |
diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc |
index d4f41191d0ae097ff85d1b511d6c59f73f26b77e..c3d86b1c70b71e5c8dcd2f0c7b47e43ca5239d9c 100644 |
--- a/net/proxy/proxy_resolver_mac.cc |
+++ b/net/proxy/proxy_resolver_mac.cc |
@@ -73,13 +73,9 @@ class ProxyResolverMac : public ProxyResolver { |
int GetProxyForURL(const GURL& url, |
ProxyInfo* results, |
const CompletionCallback& callback, |
- RequestHandle* request, |
+ scoped_ptr<Request>* request, |
const BoundNetLog& net_log) override; |
- void CancelRequest(RequestHandle request) override; |
- |
- LoadState GetLoadState(RequestHandle request) const override; |
- |
private: |
const scoped_refptr<ProxyResolverScriptData> script_data_; |
}; |
@@ -96,7 +92,7 @@ ProxyResolverMac::~ProxyResolverMac() {} |
int ProxyResolverMac::GetProxyForURL(const GURL& query_url, |
ProxyInfo* results, |
const CompletionCallback& /*callback*/, |
- RequestHandle* /*request*/, |
+ scoped_ptr<Request>* /*request*/, |
const BoundNetLog& net_log) { |
base::ScopedCFTypeRef<CFStringRef> query_ref( |
base::SysUTF8ToCFStringRef(query_url.spec())); |
@@ -203,15 +199,6 @@ int ProxyResolverMac::GetProxyForURL(const GURL& query_url, |
return OK; |
} |
-void ProxyResolverMac::CancelRequest(RequestHandle request) { |
- NOTREACHED(); |
-} |
- |
-LoadState ProxyResolverMac::GetLoadState(RequestHandle request) const { |
- NOTREACHED(); |
- return LOAD_STATE_IDLE; |
-} |
- |
} // namespace |
ProxyResolverFactoryMac::ProxyResolverFactoryMac() |