Revert "Make the proxy server HostPortPair available in document_state so that"

This reverts commit ac77ecc7.

Speculative revert.
ResourceDispatcherHostBrowserTest.CrossSiteNavigationErrorPage started
flaking on Mac ASan and Mac ASan 64 following this change.

BUG=374264

Review URL: https://codereview.chromium.org/691323002

Cr-Commit-Position: refs/heads/master@{#302207}

content/browser/loader/resource_loader.cc

@@ -55,7 +55,6 @@ void PopulateResourceResponse(ResourceRequestInfoImpl* info,
       response_info.npn_negotiated_protocol;
   response->head.connection_info = response_info.connection_info;
   response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
-  response->head.proxy_server = response_info.proxy_server;
   response->head.socket_address = request->GetSocketAddress();
   if (ServiceWorkerRequestHandler* handler =
           ServiceWorkerRequestHandler::GetHandler(request)) {

content/child/web_url_loader_impl.cc

@@ -848,7 +848,6 @@ void WebURLLoaderImpl::PopulateURLResponse(const GURL& url,
       info.was_alternate_protocol_available);
   extra_data->set_connection_info(info.connection_info);
   extra_data->set_was_fetched_via_proxy(info.was_fetched_via_proxy);
-  extra_data->set_proxy_server(info.proxy_server);
 
   // If there's no received headers end time, don't set load timing.  This is
   // the case for non-HTTP requests, requests that don't go over the wire, and

content/child/weburlresponse_extradata_impl.h

@@ -35,15 +35,6 @@ class CONTENT_EXPORT WebURLResponseExtraDataImpl :
     was_fetched_via_proxy_ = was_fetched_via_proxy;
   }
 
-  // The proxy server used if this request was loaded via an explicit proxy
-  // (HTTP, SOCKS, etc).
-  net::HostPortPair proxy_server() const {
-    return proxy_server_;
-  }
-  void set_proxy_server(net::HostPortPair proxy_server) {
-    proxy_server_ = proxy_server;
-  }
-
   /// Flag whether this request was loaded via the SPDY protocol or not.
   // SPDY is an experimental web protocol, see http://dev.chromium.org/spdy
   bool was_fetched_via_spdy() const {
@@ -91,7 +82,6 @@ class CONTENT_EXPORT WebURLResponseExtraDataImpl :
   std::string npn_negotiated_protocol_;
   bool is_ftp_directory_listing_;
   bool was_fetched_via_proxy_;
-  net::HostPortPair proxy_server_;
   bool was_fetched_via_spdy_;
   bool was_npn_negotiated_;
   net::HttpResponseInfo::ConnectionInfo connection_info_;

content/common/resource_messages.h

@@ -132,7 +132,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseInfo)
   IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_start)
   IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_ready)
   IPC_STRUCT_TRAITS_MEMBER(service_worker_fetch_end)
-  IPC_STRUCT_TRAITS_MEMBER(proxy_server)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(net::RedirectInfo)

content/public/common/resource_response.cc

@@ -34,7 +34,6 @@ scoped_refptr<ResourceResponse> ResourceResponse::DeepCopy() const {
       new_response->head.was_alternate_protocol_available;
   new_response->head.connection_info = head.connection_info;
   new_response->head.was_fetched_via_proxy = head.was_fetched_via_proxy;
-  new_response->head.proxy_server = head.proxy_server;
   new_response->head.npn_negotiated_protocol = head.npn_negotiated_protocol;
   new_response->head.socket_address = head.socket_address;
   new_response->head.was_fetched_via_service_worker =

content/public/common/resource_response_info.h

@@ -93,10 +93,8 @@ struct ResourceResponseInfo {
 
   // True if the response was fetched via an explicit proxy (as opposed to a
   // transparent proxy). The proxy could be any type of proxy, HTTP or SOCKS.
-  // Note: we cannot tell if a transparent proxy may have been involved. If
-  // true, |proxy_server| contains the name of the proxy server that was used.
+  // Note: we cannot tell if a transparent proxy may have been involved.
   bool was_fetched_via_proxy;
-  net::HostPortPair proxy_server;
 
   // NPN protocol negotiated with the server.
   std::string npn_negotiated_protocol;

content/public/renderer/document_state.h

@@ -161,11 +161,6 @@ class CONTENT_EXPORT DocumentState
     was_fetched_via_proxy_ = value;
   }
 
-  net::HostPortPair proxy_server() const { return proxy_server_; }
-  void set_proxy_server(net::HostPortPair proxy_server) {
-    proxy_server_ = proxy_server;
-  }
-
   void set_was_prefetcher(bool value) { was_prefetcher_ = value; }
   bool was_prefetcher() const { return was_prefetcher_; }
 
@@ -209,7 +204,6 @@ class CONTENT_EXPORT DocumentState
   bool was_alternate_protocol_available_;
   net::HttpResponseInfo::ConnectionInfo connection_info_;
   bool was_fetched_via_proxy_;
-  net::HostPortPair proxy_server_;
 
   // A prefetcher is a page that contains link rel=prefetch elements.
   bool was_prefetcher_;

content/renderer/render_frame_impl.cc

@@ -2953,8 +2953,6 @@ void RenderFrameImpl::didReceiveResponse(
         extra_data->connection_info());
     document_state->set_was_fetched_via_proxy(
         extra_data->was_fetched_via_proxy());
-    document_state->set_proxy_server(
-        extra_data->proxy_server());
   }
   InternalDocumentStateData* internal_data =
       InternalDocumentStateData::FromDocumentState(document_state);