Rename WebPackagePrefetchHandler to SignedExchangePrefetchHandler

To clarify that it is for single Signed Exchange.

Bug: 803774
Change-Id: I9890e8a2d717e539f9b03848d04df60e875a0b1a
Reviewed-on: https://chromium-review.googlesource.com/1101611Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567577}

content/browser/BUILD.gn

@@ -1739,6 +1739,8 @@ jumbo_source_set("browser") {
     "web_package/signed_exchange_handler.h",
     "web_package/signed_exchange_loader.cc",
     "web_package/signed_exchange_loader.h",
+    "web_package/signed_exchange_prefetch_handler.cc",
+    "web_package/signed_exchange_prefetch_handler.h",
     "web_package/signed_exchange_prologue.cc",
     "web_package/signed_exchange_prologue.h",
     "web_package/signed_exchange_request_handler.cc",
@@ -1753,8 +1755,6 @@ jumbo_source_set("browser") {
     "web_package/signed_exchange_utils.h",
     "web_package/web_package_context_impl.cc",
     "web_package/web_package_context_impl.h",
-    "web_package/web_package_prefetch_handler.cc",
-    "web_package/web_package_prefetch_handler.h",
     "webrtc/webrtc_internals.cc",
     "webrtc/webrtc_internals.h",
     "webrtc/webrtc_internals_message_handler.cc",

content/browser/loader/prefetch_url_loader.cc

@@ -5,8 +5,8 @@
 #include "content/browser/loader/prefetch_url_loader.h"
 
 #include "base/feature_list.h"
+#include "content/browser/web_package/signed_exchange_prefetch_handler.h"
 #include "content/browser/web_package/signed_exchange_utils.h"
-#include "content/browser/web_package/web_package_prefetch_handler.h"
 #include "content/public/common/content_features.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "services/network/public/cpp/features.h"
@@ -59,9 +59,9 @@ void PrefetchURLLoader::FollowRedirect(
   DCHECK(!modified_request_headers.has_value()) << "Redirect with modified "
                                                    "headers was not supported "
                                                    "yet. crbug.com/845683";
-  if (web_package_prefetch_handler_) {
+  if (signed_exchange_prefetch_handler_) {
     // Rebind |client_binding_| and |loader_|.
-    client_binding_.Bind(web_package_prefetch_handler_->FollowRedirect(
+    client_binding_.Bind(signed_exchange_prefetch_handler_->FollowRedirect(
         mojo::MakeRequest(&loader_)));
     return;
   }
@@ -89,15 +89,17 @@ void PrefetchURLLoader::ResumeReadingBodyFromNet() {
 void PrefetchURLLoader::OnReceiveResponse(
     const network::ResourceResponseHead& response) {
   if (signed_exchange_utils::ShouldHandleAsSignedHTTPExchange(url_, response)) {
-    DCHECK(!web_package_prefetch_handler_);
+    DCHECK(!signed_exchange_prefetch_handler_);
 
     // Note that after this point this doesn't directly get upcalls from the
     // network. (Until |this| calls the handler's FollowRedirect.)
-    web_package_prefetch_handler_ = std::make_unique<WebPackagePrefetchHandler>(
-        frame_tree_node_id_getter_, report_raw_headers_, load_flags_, response,
-        std::move(loader_), client_binding_.Unbind(), network_loader_factory_,
-        request_initiator_, url_, url_loader_throttles_getter_,
-        resource_context_, request_context_getter_, this);
+    signed_exchange_prefetch_handler_ =
+        std::make_unique<SignedExchangePrefetchHandler>(
+            frame_tree_node_id_getter_, report_raw_headers_, load_flags_,
+            response, std::move(loader_), client_binding_.Unbind(),
+            network_loader_factory_, request_initiator_, url_,
+            url_loader_throttles_getter_, resource_context_,
+            request_context_getter_, this);
     return;
   }
   forwarding_client_->OnReceiveResponse(response);

content/browser/loader/prefetch_url_loader.h

@@ -28,7 +28,7 @@ namespace content {
 
 class ResourceContext;
 class URLLoaderThrottle;
-class WebPackagePrefetchHandler;
+class SignedExchangePrefetchHandler;
 
 // PrefetchURLLoader which basically just keeps draining the data.
 class CONTENT_EXPORT PrefetchURLLoader : public network::mojom::URLLoader,
@@ -114,7 +114,8 @@ class CONTENT_EXPORT PrefetchURLLoader : public network::mojom::URLLoader,
 
   std::unique_ptr<mojo::DataPipeDrainer> pipe_drainer_;
 
-  std::unique_ptr<WebPackagePrefetchHandler> web_package_prefetch_handler_;
+  std::unique_ptr<SignedExchangePrefetchHandler>
+      signed_exchange_prefetch_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefetchURLLoader);
 };

content/browser/web_package/web_package_prefetch_handler.cc → content/browser/web_package/signed_exchange_prefetch_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/web_package/web_package_prefetch_handler.h"
+#include "content/browser/web_package/signed_exchange_prefetch_handler.h"
 
 #include "base/callback.h"
 #include "base/feature_list.h"
@@ -18,7 +18,7 @@
 
 namespace content {
 
-WebPackagePrefetchHandler::WebPackagePrefetchHandler(
+SignedExchangePrefetchHandler::SignedExchangePrefetchHandler(
     base::RepeatingCallback<int(void)> frame_tree_node_id_getter,
     bool report_raw_headers,
     int load_flags,
@@ -58,10 +58,10 @@ WebPackagePrefetchHandler::WebPackagePrefetchHandler(
       request_context_getter);
 }
 
-WebPackagePrefetchHandler::~WebPackagePrefetchHandler() = default;
+SignedExchangePrefetchHandler::~SignedExchangePrefetchHandler() = default;
 
 network::mojom::URLLoaderClientRequest
-WebPackagePrefetchHandler::FollowRedirect(
+SignedExchangePrefetchHandler::FollowRedirect(
     network::mojom::URLLoaderRequest loader_request) {
   DCHECK(signed_exchange_loader_);
   network::mojom::URLLoaderClientPtr client;
@@ -72,40 +72,40 @@ WebPackagePrefetchHandler::FollowRedirect(
   return pending_request;
 }
 
-void WebPackagePrefetchHandler::OnReceiveResponse(
+void SignedExchangePrefetchHandler::OnReceiveResponse(
     const network::ResourceResponseHead& head) {
   NOTREACHED();
 }
 
-void WebPackagePrefetchHandler::OnReceiveRedirect(
+void SignedExchangePrefetchHandler::OnReceiveRedirect(
     const net::RedirectInfo& redirect_info,
     const network::ResourceResponseHead& head) {
   forwarding_client_->OnReceiveRedirect(redirect_info, head);
 }
 
-void WebPackagePrefetchHandler::OnUploadProgress(
+void SignedExchangePrefetchHandler::OnUploadProgress(
     int64_t current_position,
     int64_t total_size,
     base::OnceCallback<void()> callback) {
   NOTREACHED();
 }
 
-void WebPackagePrefetchHandler::OnReceiveCachedMetadata(
+void SignedExchangePrefetchHandler::OnReceiveCachedMetadata(
     const std::vector<uint8_t>& data) {
   NOTREACHED();
 }
 
-void WebPackagePrefetchHandler::OnTransferSizeUpdated(
+void SignedExchangePrefetchHandler::OnTransferSizeUpdated(
     int32_t transfer_size_diff) {
   NOTREACHED();
 }
 
-void WebPackagePrefetchHandler::OnStartLoadingResponseBody(
+void SignedExchangePrefetchHandler::OnStartLoadingResponseBody(
     mojo::ScopedDataPipeConsumerHandle body) {
   NOTREACHED();
 }
 
-void WebPackagePrefetchHandler::OnComplete(
+void SignedExchangePrefetchHandler::OnComplete(
     const network::URLLoaderCompletionStatus& status) {
   forwarding_client_->OnComplete(status);
 }

content/browser/web_package/web_package_prefetch_handler.h → content/browser/web_package/signed_exchange_prefetch_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_PREFETCH_HANDLER_H_
-#define CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_PREFETCH_HANDLER_H_
+#ifndef CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PREFETCH_HANDLER_H_
+#define CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PREFETCH_HANDLER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
@@ -25,7 +25,8 @@ class URLLoaderThrottle;
 class SignedExchangeLoader;
 
 // Attached to each PrefetchURLLoader if the prefetch is for a signed exchange.
-class WebPackagePrefetchHandler final : public network::mojom::URLLoaderClient {
+class SignedExchangePrefetchHandler final
+    : public network::mojom::URLLoaderClient {
  public:
   using URLLoaderThrottlesGetter = base::RepeatingCallback<
       std::vector<std::unique_ptr<content::URLLoaderThrottle>>()>;
@@ -34,7 +35,7 @@ class WebPackagePrefetchHandler final : public network::mojom::URLLoaderClient {
   // SignedExchangeLoader (so that the loader can load data from the network).
   // |forwarding_client| is a pointer to the downstream client (typically who
   // creates this handler).
-  WebPackagePrefetchHandler(
+  SignedExchangePrefetchHandler(
       base::RepeatingCallback<int(void)> frame_tree_node_id_getter,
       bool report_raw_headers,
       int load_flags,
@@ -49,7 +50,7 @@ class WebPackagePrefetchHandler final : public network::mojom::URLLoaderClient {
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       network::mojom::URLLoaderClient* forwarding_client);
 
-  ~WebPackagePrefetchHandler() override;
+  ~SignedExchangePrefetchHandler() override;
 
   // This connects |loader_request| to the SignedExchangeLoader, and returns the
   // pending client request to the loader.
@@ -79,9 +80,9 @@ class WebPackagePrefetchHandler final : public network::mojom::URLLoaderClient {
 
   network::mojom::URLLoaderClient* forwarding_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebPackagePrefetchHandler);
+  DISALLOW_COPY_AND_ASSIGN(SignedExchangePrefetchHandler);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_WEB_PACKAGE_WEB_PACKAGE_PREFETCH_HANDLER_H_
+#endif  // CONTENT_BROWSER_WEB_PACKAGE_SIGNED_EXCHANGE_PREFETCH_HANDLER_H_