Store net::ProxyServer in HttpResponseInfo object

net/http/http_response_info.h

 // Copyright (c) 2011 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_HTTP_HTTP_RESPONSE_INFO_H_
 #define NET_HTTP_HTTP_RESPONSE_INFO_H_
 
 #include <string>
 
 #include "base/time/time.h"
-#include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/http/http_vary_data.h"
+#include "net/proxy/proxy_server.h"
 #include "net/socket/next_proto.h"
 #include "net/ssl/ssl_info.h"
 
 namespace base {
 class Pickle;
 }
 
 namespace net {
 
 class AuthChallengeInfo;
@@ skipping 95 matching lines @@
 
   // True if the request was fetched over a SPDY channel.
   bool was_fetched_via_spdy;
 
   // True if ALPN was negotiated for this request.
   bool was_alpn_negotiated;
 
   // True if the request was fetched via an explicit proxy.  The proxy could
   // be any type of proxy, HTTP or SOCKS.  Note, we do not know if a
   // transparent proxy may have been involved. If true, |proxy_server| contains
-  // the name of the proxy server that was used.
+  // the proxy server that was used.
+  // TODO(tbansal): crbug.com/653354. Remove |was_fetched_via_proxy|.
   bool was_fetched_via_proxy;
-  HostPortPair proxy_server;
+  ProxyServer proxy_server;
 
   // Whether the request use http proxy or server authentication.
   bool did_use_http_auth;
 
   // True if the resource was originally fetched for a prefetch and has not been
   // used since.
   bool unused_since_prefetch;
 
   // True if this resource is stale and requires async revalidation.
   // This value is not persisted by Persist(); it is only ever set when the
@@ skipping 48 matching lines @@
   scoped_refptr<IOBufferWithSize> metadata;
 
   static ConnectionInfo ConnectionInfoFromNextProto(NextProto next_proto);
 
   static std::string ConnectionInfoToString(ConnectionInfo connection_info);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_RESPONSE_INFO_H_