Get rid of synchronous ResolveProxy API.

Also remove the ProxyInfo::Apply method.
Review URL: http://codereview.chromium.org/19502

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9015 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 12 deletions

diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 846a2d9..2553124 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -17,10 +17,6 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 
-#if defined(OS_WIN)
-typedef LPVOID HINTERNET;  // From winhttp.h
-#endif
-
 class GURL;
 
 namespace net {
@@ -94,9 +90,9 @@ class ProxyService {
   // Used internally to handle PAC queries.
   class PacRequest;
 
-  // Returns OK if proxy information could be provided synchronously.  Else,
-  // ERR_IO_PENDING is returned to indicate that the result will be available
-  // when the callback is run.  The callback is run on the thread that calls
+  // Returns ERR_IO_PENDING if the proxy information could not be provided
+  // synchronously, to indicate that the result will be available when the
+  // callback is run.  The callback is run on the thread that calls
   // ResolveProxy.
   //
   // The caller is responsible for ensuring that |results| and |callback|
@@ -246,11 +242,6 @@ class ProxyInfo {
   // This may optionally be a semi-colon delimited list of proxy servers.
   void UseNamedProxy(const std::string& proxy_server);
 
-#if defined(OS_WIN)
-  // Apply this proxy information to the given WinHTTP request handle.
-  void Apply(HINTERNET request_handle);
-#endif
-
   // Returns true if this proxy info specifies a direct connection.
   bool is_direct() const { return proxy_list_.Get().empty(); }