2 files changed, 1 insertions, 18 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 06141f6..f1c9865 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -293,15 +293,7 @@ ProxyService* ProxyService::Create(const ProxyInfo* pi) {
   if (pi) {
     // The ProxyResolver is set to NULL, since it should never be called
     // (because the configuration will never require PAC).
-    ProxyService* proxy_service =
-        new ProxyService(new ProxyConfigServiceFixed(*pi), NULL);
-
-    // TODO(eroman): remove this WinHTTP hack once it is no more.
-    // We keep a copy of the ProxyInfo that was used to create the
-    // proxy service, so we can pass it to WinHTTP.
-    proxy_service->proxy_info_.reset(new ProxyInfo(*pi));
-
-    return proxy_service;
+    return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL);
   }
 #if defined(OS_WIN)
   return new ProxyService(new ProxyConfigServiceWin(),
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 6a9c04b..1d528dc 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -144,12 +144,6 @@ class ProxyService {
   // so it falls back to direct connect.
   static ProxyService* CreateNull();
 
-  // TODO(eroman): remove once WinHTTP is gone.
-  // Get the ProxyInfo used to create this proxy service (only used by WinHTTP).
-  const ProxyInfo* proxy_info() const {
-    return proxy_info_.get();
-  }
-
  private:
   friend class PacRequest;
 
@@ -183,9 +177,6 @@ class ProxyService {
   // the config changes.
   ProxyConfig config_;
 
-  // TODO(eroman): remove this once WinHTTP stack is gone.
-  scoped_ptr<ProxyInfo> proxy_info_;
-
   // Indicates that the configuration is bad and should be ignored.
   bool config_is_bad_;