Use network::ResourceRequestInfo::proxy_server instead of was_fetched_via_proxy

... and remove the later.

This is a follow up of mmenke's request in [1].

[1] https://crrev.com/c/1251642/3/services/network/url_loader.cc#70

TBR=nparker@chromium (components/safe_browsing/browser/threat_details_cache.cc)
TBR=jam@chromium.org (content/browser/loader/resource_loader.cc)

BUG=773295

Change-Id: I932315bec7d1790dbc8726eeb1decce6e76172b1
Reviewed-on: https://chromium-review.googlesource.com/c/1320769
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606864}

components/policy/core/common/cloud/device_management_service.cc

@@ -686,7 +686,9 @@ void DeviceManagementService::OnURLLoaderComplete(
   bool was_fetched_via_proxy = false;
   std::string mime_type;
   if (url_loader->ResponseInfo()) {
-    was_fetched_via_proxy = url_loader->ResponseInfo()->was_fetched_via_proxy;
+    was_fetched_via_proxy =
+        url_loader->ResponseInfo()->proxy_server.is_valid() &&
+        !url_loader->ResponseInfo()->proxy_server.is_direct();
     mime_type = url_loader->ResponseInfo()->mime_type;
     if (url_loader->ResponseInfo()->headers)
       response_code = url_loader->ResponseInfo()->headers->response_code();

components/safe_browsing/browser/threat_details_cache.cc

@@ -198,7 +198,10 @@ void ThreatDetailsCacheCollector::ReadResponse(
     pb_header->set_value(value);
   }
 
-  if (!current_load_->ResponseInfo()->was_fetched_via_proxy) {
+  bool was_fetched_via_proxy =
+      current_load_->ResponseInfo()->proxy_server.is_valid() &&
+      !current_load_->ResponseInfo()->proxy_server.is_direct();
+  if (!was_fetched_via_proxy) {
     pb_response->set_remote_ip(
         current_load_->ResponseInfo()->socket_address.ToString());
   }

content/browser/loader/resource_loader.cc

@@ -84,7 +84,7 @@ void PopulateResourceResponse(
       response_info.alpn_negotiated_protocol;
   response->head.connection_info = response_info.connection_info;
   response->head.socket_address = response_info.socket_address;
-  response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
+  response->head.proxy_server = request->proxy_server();
   response->head.network_accessed = response_info.network_accessed;
   response->head.async_revalidation_requested =
       response_info.async_revalidation_requested;

services/network/public/cpp/resource_response.cc

@@ -39,7 +39,6 @@ scoped_refptr<ResourceResponse> ResourceResponse::DeepCopy() const {
   new_response->head.alpn_negotiated_protocol = head.alpn_negotiated_protocol;
   new_response->head.socket_address = head.socket_address;
   new_response->head.was_fetched_via_cache = head.was_fetched_via_cache;
-  new_response->head.was_fetched_via_proxy = head.was_fetched_via_proxy;
   new_response->head.proxy_server = head.proxy_server;
   new_response->head.was_fetched_via_service_worker =
       head.was_fetched_via_service_worker;

services/network/public/cpp/resource_response_info.cc

@@ -21,7 +21,6 @@ ResourceResponseInfo::ResourceResponseInfo()
       was_alpn_negotiated(false),
       was_alternate_protocol_available(false),
       connection_info(net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN),
-      was_fetched_via_proxy(false),
       was_fetched_via_service_worker(false),
       was_fallback_required_by_service_worker(false),
       response_type(mojom::FetchResponseType::kDefault),

services/network/public/cpp/resource_response_info.h

@@ -112,9 +112,6 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceResponseInfo {
   // True if the response came from cache.
   bool was_fetched_via_cache = false;
 
-  // True if the response was delivered through a proxy.
-  bool was_fetched_via_proxy;
-
   // The proxy server used for this request, if any.
   net::ProxyServer proxy_server;
 

services/network/url_loader.cc

@@ -68,7 +68,6 @@ void PopulateResourceResponse(net::URLRequest* request,
   response->head.connection_info = response_info.connection_info;
   response->head.socket_address = response_info.socket_address;
   response->head.was_fetched_via_cache = request->was_cached();
-  response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
   response->head.proxy_server = request->proxy_server();
   response->head.network_accessed = response_info.network_accessed;
   response->head.async_revalidation_requested =