service worker: Remove CreateHttpResponseInfoAndCheckHeaders()

This function was only used from WriteResponseHead() to convert
URLResponseHead to HttpResponseInfo. Validation checks are already
done before WriteResponseHead() by CheckResponseHead(), so we don't
need to check twice. Remove duplicated checks and move conversion
into WriteResponseHead().

Bug: 1055677
Change-Id: I7b21d318899d370be91d153dff26ef46ef27a08a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2270295Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783407}

content/browser/service_worker/service_worker_loader_helpers.cc

@@ -63,30 +63,6 @@ bool CheckResponseHead(
   return true;
 }
 
-std::unique_ptr<net::HttpResponseInfo> CreateHttpResponseInfoAndCheckHeaders(
-    const network::mojom::URLResponseHead& response_head,
-    blink::ServiceWorkerStatusCode* out_service_worker_status,
-    network::URLLoaderCompletionStatus* out_completion_status,
-    std::string* out_error_message) {
-  if (!CheckResponseHead(response_head, out_service_worker_status,
-                         out_completion_status, out_error_message)) {
-    return nullptr;
-  }
-
-  auto response_info = std::make_unique<net::HttpResponseInfo>();
-  response_info->headers = response_head.headers;
-  if (response_head.ssl_info.has_value())
-    response_info->ssl_info = *response_head.ssl_info;
-  response_info->was_fetched_via_spdy = response_head.was_fetched_via_spdy;
-  response_info->was_alpn_negotiated = response_head.was_alpn_negotiated;
-  response_info->alpn_negotiated_protocol =
-      response_head.alpn_negotiated_protocol;
-  response_info->connection_info = response_head.connection_info;
-  response_info->remote_endpoint = response_head.remote_endpoint;
-  response_info->response_time = response_head.response_time;
-  return response_info;
-}
-
 bool ShouldBypassCacheDueToUpdateViaCache(
     bool is_main_script,
     blink::mojom::ServiceWorkerUpdateViaCache cache_mode) {

content/browser/service_worker/service_worker_loader_helpers.h

@@ -36,16 +36,6 @@ bool CheckResponseHead(
     network::URLLoaderCompletionStatus* out_completion_status,
     std::string* out_error_message);
 
-// Creates net::HttpResponseInfo from |response_head|. Returns nullptr when the
-// response is invalid.
-// TODO(crbug.com/1060076): Remove this once HttpResponseInfo dependencies are
-// gone.
-std::unique_ptr<net::HttpResponseInfo> CreateHttpResponseInfoAndCheckHeaders(
-    const network::mojom::URLResponseHead& response_head,
-    blink::ServiceWorkerStatusCode* out_service_worker_status,
-    network::URLLoaderCompletionStatus* out_completion_status,
-    std::string* out_error_message);
-
 bool ShouldBypassCacheDueToUpdateViaCache(
     bool is_main_script,
     blink::mojom::ServiceWorkerUpdateViaCache cache_mode);

content/browser/service_worker/service_worker_resource_ops.cc

@@ -4,7 +4,6 @@
 
 #include "content/browser/service_worker/service_worker_resource_ops.h"
 
-#include "content/browser/service_worker/service_worker_loader_helpers.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "services/network/public/cpp/net_adapters.h"
 #include "third_party/blink/public/common/blob/blob_utils.h"
@@ -236,18 +235,18 @@ ServiceWorkerResourceWriterImpl::~ServiceWorkerResourceWriterImpl() = default;
 void ServiceWorkerResourceWriterImpl::WriteResponseHead(
     network::mojom::URLResponseHeadPtr response_head,
     WriteResponseHeadCallback callback) {
-  blink::ServiceWorkerStatusCode service_worker_status;
-  network::URLLoaderCompletionStatus completion_status;
-  std::string error_message;
-  std::unique_ptr<net::HttpResponseInfo> response_info =
-      service_worker_loader_helpers::CreateHttpResponseInfoAndCheckHeaders(
-          *response_head, &service_worker_status, &completion_status,
-          &error_message);
-  if (!response_info) {
-    DCHECK_NE(net::OK, completion_status.error_code);
-    std::move(callback).Run(completion_status.error_code);
-    return;
-  }
+  // Convert URLResponseHead to HttpResponseInfo.
+  auto response_info = std::make_unique<net::HttpResponseInfo>();
+  response_info->headers = response_head->headers;
+  if (response_head->ssl_info.has_value())
+    response_info->ssl_info = *response_head->ssl_info;
+  response_info->was_fetched_via_spdy = response_head->was_fetched_via_spdy;
+  response_info->was_alpn_negotiated = response_head->was_alpn_negotiated;
+  response_info->alpn_negotiated_protocol =
+      response_head->alpn_negotiated_protocol;
+  response_info->connection_info = response_head->connection_info;
+  response_info->remote_endpoint = response_head->remote_endpoint;
+  response_info->response_time = response_head->response_time;
 
   auto info_buffer =
       base::MakeRefCounted<HttpResponseInfoIOBuffer>(std::move(response_info));