Rename WebResourceRequestSender to ResourceRequestSender

Bug: 1413912
Change-Id: I398226c91fc82d4df8fa9a85b3fb02457c19c0dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4243826
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1105388}

content/public/renderer/render_thread.h

@@ -89,7 +89,7 @@ class CONTENT_EXPORT RenderThread : virtual public ChildThread {
   virtual void AddObserver(RenderThreadObserver* observer) = 0;
   virtual void RemoveObserver(RenderThreadObserver* observer) = 0;
 
-  // Set the WebResourceRequestSender delegate object for this process.
+  // Set the ResourceRequestSender delegate object for this process.
   // This does not take the ownership of the delegate. It is expected that the
   // delegate is kept alive while a request may be dispatched.
   virtual void SetResourceRequestSenderDelegate(

third_party/blink/public/platform/web_resource_request_sender_delegate.h

@@ -15,7 +15,7 @@ class WebURL;
 // Interface that allows observing request events and optionally replacing
 // the peer. Note that if it doesn't replace the peer it must return the
 // current peer so that the ownership is continued to be held by
-// WebResourceRequestSender.
+// ResourceRequestSender.
 class BLINK_PLATFORM_EXPORT WebResourceRequestSenderDelegate {
  public:
   virtual ~WebResourceRequestSenderDelegate() = default;

third_party/blink/renderer/platform/loader/BUILD.gn

@@ -135,6 +135,8 @@ blink_platform_sources("loader") {
     "fetch/url_loader/navigation_body_loader.h",
     "fetch/url_loader/request_conversion.cc",
     "fetch/url_loader/request_conversion.h",
+    "fetch/url_loader/resource_request_sender.cc",
+    "fetch/url_loader/resource_request_sender.h",
     "fetch/url_loader/sync_load_context.cc",
     "fetch/url_loader/sync_load_context.h",
     "fetch/url_loader/sync_load_response.cc",
@@ -145,8 +147,6 @@ blink_platform_sources("loader") {
     "fetch/url_loader/url_loader_client.h",
     "fetch/url_loader/url_loader_factory.cc",
     "fetch/url_loader/url_loader_factory.h",
-    "fetch/url_loader/web_resource_request_sender.cc",
-    "fetch/url_loader/web_resource_request_sender.h",
     "fetch/url_loader/worker_main_script_loader.cc",
     "fetch/url_loader/worker_main_script_loader.h",
     "fetch/url_loader/worker_main_script_loader_client.h",
@@ -232,9 +232,9 @@ source_set("unit_tests") {
     "fetch/url_loader/cached_metadata_handler_test.cc",
     "fetch/url_loader/mojo_url_loader_client_unittest.cc",
     "fetch/url_loader/navigation_body_loader_unittest.cc",
+    "fetch/url_loader/resource_request_sender_unittest.cc",
     "fetch/url_loader/sync_load_context_unittest.cc",
     "fetch/url_loader/url_loader_unittest.cc",
-    "fetch/url_loader/web_resource_request_sender_unittest.cc",
     "fetch/url_loader/worker_main_script_loader_unittest.cc",
     "link_header_test.cc",
     "static_data_navigation_body_loader_test.cc",

third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc

@@ -25,7 +25,7 @@
 #include "third_party/blink/renderer/platform/back_forward_cache_utils.h"
 #include "third_party/blink/renderer/platform/loader/fetch/back_forward_cache_loader_helper.h"
 #include "third_party/blink/renderer/platform/loader/fetch/loader_freeze_mode.h"
-#include "third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.h"
+#include "third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
 
 namespace blink {
@@ -44,7 +44,7 @@ class MojoURLLoaderClient::DeferredMessage {
   virtual ~DeferredMessage() = default;
 
   virtual void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) = 0;
+      ResourceRequestSender* resource_request_sender) = 0;
   virtual bool IsCompletionMessage() const = 0;
 };
 
@@ -57,8 +57,7 @@ class MojoURLLoaderClient::DeferredOnReceiveResponse final
       : response_head_(std::move(response_head)),
         response_arrival_(response_arrival) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnReceivedResponse(std::move(response_head_),
                                                 response_arrival_);
   }
@@ -80,8 +79,7 @@ class MojoURLLoaderClient::DeferredOnReceiveRedirect final
         response_head_(std::move(response_head)),
         task_runner_(std::move(task_runner)) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnReceivedRedirect(
         redirect_info_, std::move(response_head_), task_runner_);
   }
@@ -99,8 +97,7 @@ class MojoURLLoaderClient::DeferredOnUploadProgress final
   DeferredOnUploadProgress(int64_t current, int64_t total)
       : current_(current), total_(total) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnUploadProgress(current_, total_);
   }
   bool IsCompletionMessage() const override { return false; }
@@ -116,8 +113,7 @@ class MojoURLLoaderClient::DeferredOnReceiveCachedMetadata final
   explicit DeferredOnReceiveCachedMetadata(mojo_base::BigBuffer data)
       : data_(std::move(data)) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnReceivedCachedMetadata(std::move(data_));
   }
   bool IsCompletionMessage() const override { return false; }
@@ -133,8 +129,7 @@ class MojoURLLoaderClient::DeferredOnStartLoadingResponseBody final
       mojo::ScopedDataPipeConsumerHandle body)
       : body_(std::move(body)) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnStartLoadingResponseBody(std::move(body_));
   }
   bool IsCompletionMessage() const override { return false; }
@@ -148,8 +143,7 @@ class MojoURLLoaderClient::DeferredOnComplete final : public DeferredMessage {
   explicit DeferredOnComplete(const network::URLLoaderCompletionStatus& status)
       : status_(status) {}
 
-  void HandleMessage(
-      WebResourceRequestSender* resource_request_sender) override {
+  void HandleMessage(ResourceRequestSender* resource_request_sender) override {
     resource_request_sender->OnRequestComplete(status_);
   }
   bool IsCompletionMessage() const override { return true; }
@@ -276,7 +270,7 @@ class MojoURLLoaderClient::BodyBuffer final
 };
 
 MojoURLLoaderClient::MojoURLLoaderClient(
-    WebResourceRequestSender* resource_request_sender,
+    ResourceRequestSender* resource_request_sender,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     bool bypass_redirect_checks,
     const GURL& request_url,
@@ -497,7 +491,7 @@ void MojoURLLoaderClient::OnComplete(
   has_received_complete_ = true;
   StopBackForwardCacheEvictionTimer();
 
-  // Dispatch completion status to the WebResourceRequestSender.
+  // Dispatch completion status to the ResourceRequestSender.
   // Except for errors, there must always be a response's body.
   DCHECK(has_received_response_body_ || status.error_code != net::OK);
   if (NeedsStoringMessage()) {

third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.h

@@ -38,15 +38,15 @@ struct URLLoaderCompletionStatus;
 
 namespace blink {
 class BackForwardCacheLoaderHelper;
-class WebResourceRequestSender;
+class ResourceRequestSender;
 
 // MojoURLLoaderClient is an implementation of
 // network::mojom::URLLoaderClient to receive messages from a single URLLoader.
 class BLINK_PLATFORM_EXPORT MojoURLLoaderClient final
     : public network::mojom::URLLoaderClient {
  public:
   MojoURLLoaderClient(
-      WebResourceRequestSender* resource_request_sender,
+      ResourceRequestSender* resource_request_sender,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       bool bypass_redirect_checks,
       const GURL& request_url,
@@ -108,7 +108,7 @@ class BLINK_PLATFORM_EXPORT MojoURLLoaderClient final
   bool has_received_complete_ = false;
   WebLoaderFreezeMode freeze_mode_ = WebLoaderFreezeMode::kNone;
   int32_t accumulated_transfer_size_diff_during_deferred_ = 0;
-  WebResourceRequestSender* const resource_request_sender_;
+  ResourceRequestSender* const resource_request_sender_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   bool bypass_redirect_checks_ = false;
   KURL last_loaded_url_;

third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client_unittest.cc

@@ -25,7 +25,7 @@
 #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_runtime_features.h"
 #include "third_party/blink/renderer/platform/loader/fetch/back_forward_cache_loader_helper.h"
-#include "third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.h"
+#include "third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender.h"
 #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 
 namespace blink {
@@ -34,11 +34,11 @@ namespace {
 
 constexpr size_t kDataPipeCapacity = 4096;
 
-class MockWebResourceRequestSender : public WebResourceRequestSender {
+class MockResourceRequestSender : public ResourceRequestSender {
  public:
   struct Context;
-  MockWebResourceRequestSender() : context_(new Context()) {}
-  ~MockWebResourceRequestSender() override = default;
+  MockResourceRequestSender() : context_(new Context()) {}
+  ~MockResourceRequestSender() override = default;
 
   void OnUploadProgress(int64_t position, int64_t size) override {
     EXPECT_FALSE(context_->complete);
@@ -162,7 +162,7 @@ std::string ReadOneChunk(mojo::ScopedDataPipeConsumerHandle* handle) {
 }
 
 std::string GetRequestPeerContextBody(
-    MockWebResourceRequestSender::Context* context) {
+    MockResourceRequestSender::Context* context) {
   if (context->body_handle) {
     context->data += ReadOneChunk(&context->body_handle);
   }
@@ -187,7 +187,7 @@ class WebMojoURLLoaderClientTest : public ::testing::Test,
                                    public ::testing::WithParamInterface<bool> {
  protected:
   WebMojoURLLoaderClientTest()
-      : resource_request_sender_(new MockWebResourceRequestSender()) {
+      : resource_request_sender_(new MockResourceRequestSender()) {
     if (DeferWithBackForwardCacheEnabled()) {
       scoped_feature_list_.InitAndEnableFeature(
           blink::features::kLoadingTasksUnfreezable);
@@ -261,8 +261,8 @@ class WebMojoURLLoaderClientTest : public ::testing::Test,
   base::test::ScopedFeatureList scoped_feature_list_;
   std::unique_ptr<ThrottlingURLLoader> url_loader_;
   std::unique_ptr<MojoURLLoaderClient> client_;
-  std::unique_ptr<MockWebResourceRequestSender> resource_request_sender_;
-  MockWebResourceRequestSender::Context* context_;
+  std::unique_ptr<MockResourceRequestSender> resource_request_sender_;
+  MockResourceRequestSender::Context* context_;
   int request_id_ = 0;
   mojo::Remote<network::mojom::URLLoaderClient> url_loader_client_;
 };