Remove Pause/ResumeReadingBodyFromNet IPCs
As described in the bug (crbug.com/392023850), we don't need these
IPCs anymore.
Bug: 392023850
Change-Id: Ia79e6c2b5c0ce54588c892687dcd3671933f7778
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6197457
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Reviewed-by: Rakina Zata Amni <rakina@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1411962}
diff --git a/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc b/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc
index d8891d3..4bfc52c 100644
--- a/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc
+++ b/android_webview/browser/network_service/aw_proxying_url_loader_factory.cc
@@ -166,8 +166,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void ContinueAfterIntercept();
void ContinueAfterInterceptWithOverride(
@@ -905,16 +903,6 @@
target_loader_->SetPriority(priority, intra_priority_value);
}
-void InterceptedRequest::PauseReadingBodyFromNet() {
- if (target_loader_)
- target_loader_->PauseReadingBodyFromNet();
-}
-
-void InterceptedRequest::ResumeReadingBodyFromNet() {
- if (target_loader_)
- target_loader_->ResumeReadingBodyFromNet();
-}
-
std::unique_ptr<AwContentsIoThreadClient>
InterceptedRequest::GetIoThreadClient() {
return ::android_webview::GetIoThreadClient(
diff --git a/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc b/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc
index a9938c30..db61d82 100644
--- a/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc
+++ b/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc
@@ -228,8 +228,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
explicit ExternalFileURLLoader(
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
index 063abd9d..2a904ccf 100644
--- a/chrome/browser/extensions/chrome_url_request_util.cc
+++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -129,8 +129,6 @@
// load, so priority, and pausing is not currently implemented.
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
explicit ResourceBundleFileLoader(
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.cc b/chrome/browser/offline_pages/offline_page_url_loader.cc
index 6fb31f5..b75f1b39 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader.cc
+++ b/chrome/browser/offline_pages/offline_page_url_loader.cc
@@ -116,14 +116,6 @@
// Ignore: this class doesn't have a concept of priority.
}
-void OfflinePageURLLoader::PauseReadingBodyFromNet() {
- // Ignore: this class doesn't read from network.
-}
-
-void OfflinePageURLLoader::ResumeReadingBodyFromNet() {
- // Ignore: this class doesn't read from network.
-}
-
void OfflinePageURLLoader::FallbackToDefault() {
std::move(loader_callback_).Run({});
}
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.h b/chrome/browser/offline_pages/offline_page_url_loader.h
index cbd74c4..e3c4208 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader.h
+++ b/chrome/browser/offline_pages/offline_page_url_loader.h
@@ -71,8 +71,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// OfflinePageRequestHandler::Delegate overrides:
void FallbackToDefault() override;
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc
index 5faab31..d0937aa 100644
--- a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc
+++ b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc
@@ -127,9 +127,6 @@
url_loader_receiver_.set_disconnect_handler(base::BindOnce(
&CacheAliasSearchPrefetchURLLoader::MojoDisconnectWithNoFallback,
base::Unretained(this)));
- if (paused_) {
- network_url_loader_->PauseReadingBodyFromNet();
- }
}
void CacheAliasSearchPrefetchURLLoader::OnReceiveEarlyHints(
@@ -233,22 +230,6 @@
resource_request_->priority = priority;
}
-void CacheAliasSearchPrefetchURLLoader::PauseReadingBodyFromNet() {
- // Pass through.
- if (network_url_loader_) {
- network_url_loader_->PauseReadingBodyFromNet();
- }
- paused_ = true;
-}
-
-void CacheAliasSearchPrefetchURLLoader::ResumeReadingBodyFromNet() {
- // Pass through.
- if (network_url_loader_) {
- network_url_loader_->ResumeReadingBodyFromNet();
- }
- paused_ = false;
-}
-
void CacheAliasSearchPrefetchURLLoader::MojoDisconnectForPrefetch() {
if (can_fallback_) {
RestartDirect(FallbackReason::kMojoDisconnect);
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.h b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.h
index a88f6f3b..9ca982f9 100644
--- a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.h
+++ b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.h
@@ -69,8 +69,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
@@ -123,10 +121,6 @@
// the network if the cache is not available.
bool can_fallback_ = true;
- // If the owner paused network activity, we need to propagate that if a
- // fallback occurs.
- bool paused_ = false;
-
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
base::WeakPtr<SearchPrefetchService> search_prefetch_service_;
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc
index d837b77..861a2e7 100644
--- a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc
+++ b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc
@@ -264,12 +264,6 @@
void StreamingSearchPrefetchURLLoader::ResponseReader::SetPriority(
net::RequestPriority priority,
int32_t intra_priority_value) {}
-// TODO(crbug.com/40250486): We may need to pause the producer from
-// pushing data to the client.
-void StreamingSearchPrefetchURLLoader::ResponseReader::
- PauseReadingBodyFromNet() {}
-void StreamingSearchPrefetchURLLoader::ResponseReader::
- ResumeReadingBodyFromNet() {}
StreamingSearchPrefetchURLLoader::StreamingSearchPrefetchURLLoader(
SearchPrefetchRequest* streaming_prefetch_request,
@@ -787,22 +781,6 @@
}
}
-void StreamingSearchPrefetchURLLoader::PauseReadingBodyFromNet() {
- paused_ = true;
- // Pass through.
- if (network_url_loader_) {
- network_url_loader_->PauseReadingBodyFromNet();
- }
-}
-
-void StreamingSearchPrefetchURLLoader::ResumeReadingBodyFromNet() {
- paused_ = false;
- // Pass through.
- if (network_url_loader_) {
- network_url_loader_->ResumeReadingBodyFromNet();
- }
-}
-
void StreamingSearchPrefetchURLLoader::OnURLLoaderMojoDisconnect() {
if (!network_url_loader_) {
// The connection should close after complete.
@@ -885,9 +863,6 @@
url_loader_receiver_.set_disconnect_handler(base::BindOnce(
&StreamingSearchPrefetchURLLoader::OnURLLoaderMojoDisconnectInFallback,
base::Unretained(this)));
- if (paused_) {
- network_url_loader_->PauseReadingBodyFromNet();
- }
}
void StreamingSearchPrefetchURLLoader::OnURLLoaderMojoDisconnectInFallback() {
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h
index 799b50c..ee59e30 100644
--- a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h
+++ b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h
@@ -138,8 +138,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// Sets date pipe up between this instance and its client.
void StartReadingResponseFromData(
@@ -267,8 +265,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
@@ -430,10 +426,6 @@
// Whether fallback has started.
bool is_in_fallback_ = false;
- // If the navigation path paused the url loader. Used to pause the network url
- // loader on fallback.
- bool paused_ = false;
-
// Whenever an error is reported, it needs to be reported to the service via
// this callback.
base::OnceCallback<void(bool)> report_error_callback_;
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
index 8c08b42..5f3a941e 100644
--- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
+++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
@@ -144,14 +144,6 @@
target_loader_->SetPriority(priority, intra_priority_value);
}
- void PauseReadingBodyFromNet() override {
- target_loader_->PauseReadingBodyFromNet();
- }
-
- void ResumeReadingBodyFromNet() override {
- target_loader_->ResumeReadingBodyFromNet();
- }
-
// network::mojom::URLLoaderClient:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override {
target_client_->OnReceiveEarlyHints(std::move(early_hints));
diff --git a/chrome/browser/ssl/https_upgrades_interceptor.h b/chrome/browser/ssl/https_upgrades_interceptor.h
index aa3b427..4adf4707 100644
--- a/chrome/browser/ssl/https_upgrades_interceptor.h
+++ b/chrome/browser/ssl/https_upgrades_interceptor.h
@@ -97,8 +97,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
// Returns a RequestHandler callback that can be passed to the underlying
// LoaderCallback to serve an artificial redirect to `new_url`.
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc
index 42157d2..23e4d86 100644
--- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc
+++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc
@@ -510,8 +510,6 @@
}
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
mojo::Remote<network::mojom::URLLoaderClient> loader_client_;
int64_t header_length_;
diff --git a/components/embedder_support/android/util/android_stream_reader_url_loader.cc b/components/embedder_support/android/util/android_stream_reader_url_loader.cc
index ac56a5c..0dd8c61 100644
--- a/components/embedder_support/android/util/android_stream_reader_url_loader.cc
+++ b/components/embedder_support/android/util/android_stream_reader_url_loader.cc
@@ -189,8 +189,6 @@
const std::optional<GURL>& new_url) {}
void AndroidStreamReaderURLLoader::SetPriority(net::RequestPriority priority,
int intra_priority_value) {}
-void AndroidStreamReaderURLLoader::PauseReadingBodyFromNet() {}
-void AndroidStreamReaderURLLoader::ResumeReadingBodyFromNet() {}
void AndroidStreamReaderURLLoader::Start(
std::unique_ptr<InputStream> input_stream) {
diff --git a/components/embedder_support/android/util/android_stream_reader_url_loader.h b/components/embedder_support/android/util/android_stream_reader_url_loader.h
index 7669d87..7eecf55 100644
--- a/components/embedder_support/android/util/android_stream_reader_url_loader.h
+++ b/components/embedder_support/android/util/android_stream_reader_url_loader.h
@@ -114,8 +114,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
private:
bool ParseRange(const net::HttpRequestHeaders& headers);
diff --git a/components/navigation_interception/intercept_navigation_delegate.cc b/components/navigation_interception/intercept_navigation_delegate.cc
index 1bba9d50..f239637 100644
--- a/components/navigation_interception/intercept_navigation_delegate.cc
+++ b/components/navigation_interception/intercept_navigation_delegate.cc
@@ -110,8 +110,6 @@
}
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
mojo::Remote<network::mojom::URLLoaderClient> client_;
network::ResourceRequest request_;
diff --git a/content/browser/android/content_url_loader_factory.cc b/content/browser/android/content_url_loader_factory.cc
index fc3e2b7..8e018a2 100644
--- a/content/browser/android/content_url_loader_factory.cc
+++ b/content/browser/android/content_url_loader_factory.cc
@@ -124,8 +124,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
ContentURLLoader() = default;
diff --git a/content/browser/devtools/devtools_url_loader_interceptor.cc b/content/browser/devtools/devtools_url_loader_interceptor.cc
index 2c9a303..de0d840a 100644
--- a/content/browser/devtools/devtools_url_loader_interceptor.cc
+++ b/content/browser/devtools/devtools_url_loader_interceptor.cc
@@ -463,8 +463,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient methods
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
@@ -955,7 +953,6 @@
body_reader_ = std::make_unique<BodyReader>(base::BindOnce(
&InterceptionJob::ResponseBodyComplete, base::Unretained(this)));
client_receiver_.Resume();
- loader_->ResumeReadingBodyFromNet();
}
body_reader_->AddCallback(std::move(callback));
// Needs to happen after |AddCallback| to avoid a DCHECK.
@@ -979,7 +976,6 @@
client_receiver_.Resume();
if (body_)
StartLoadingResponseBody(std::move(body_));
- loader_->ResumeReadingBodyFromNet();
}
void InterceptionJob::ContinueInterceptedRequest(
@@ -1124,7 +1120,6 @@
std::move(body_),
std::move(response_metadata_->cached_metadata));
response_metadata_.reset();
- loader_->ResumeReadingBodyFromNet();
client_receiver_.Resume();
return Response::Success();
}
@@ -1648,16 +1643,6 @@
loader_->SetPriority(priority, intra_priority_value);
}
-void InterceptionJob::PauseReadingBodyFromNet() {
- if (!body_reader_ && loader_ && state_ != State::kResponseTaken)
- loader_->PauseReadingBodyFromNet();
-}
-
-void InterceptionJob::ResumeReadingBodyFromNet() {
- if (!body_reader_ && loader_ && state_ != State::kResponseTaken)
- loader_->ResumeReadingBodyFromNet();
-}
-
// URLLoaderClient methods
void InterceptionJob::OnReceiveEarlyHints(
network::mojom::EarlyHintsPtr early_hints) {
@@ -1675,7 +1660,6 @@
std::move(cached_metadata));
return;
}
- loader_->PauseReadingBodyFromNet();
client_receiver_.Pause();
body_ = std::move(body);
diff --git a/content/browser/file_system/file_system_url_loader_factory.cc b/content/browser/file_system/file_system_url_loader_factory.cc
index eee71592..29e1c7e 100644
--- a/content/browser/file_system/file_system_url_loader_factory.cc
+++ b/content/browser/file_system/file_system_url_loader_factory.cc
@@ -118,8 +118,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
protected:
virtual void FileSystemIsMounted() = 0;
diff --git a/content/browser/loader/file_url_loader_factory.cc b/content/browser/loader/file_url_loader_factory.cc
index b2193969..10e5be5 100644
--- a/content/browser/loader/file_url_loader_factory.cc
+++ b/content/browser/loader/file_url_loader_factory.cc
@@ -178,8 +178,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
FileURLDirectoryLoader() = default;
@@ -434,8 +432,6 @@
}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
// Used to save outstanding redirect data while waiting for FollowRedirect
diff --git a/content/browser/loader/keep_alive_url_loader.cc b/content/browser/loader/keep_alive_url_loader.cc
index 24d6318..e8dffd4 100644
--- a/content/browser/loader/keep_alive_url_loader.cc
+++ b/content/browser/loader/keep_alive_url_loader.cc
@@ -431,45 +431,6 @@
url_loader_->SetPriority(priority, intra_priority_value);
}
-void KeepAliveURLLoader::PauseReadingBodyFromNet() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- TRACE_EVENT("loading", "KeepAliveURLLoader::PauseReadingBodyFromNet",
- "request_id", request_id_);
- if (HasReceivedResponse()) {
- // This may come from a renderer that tries to process a redirect which has
- // been previously handled in this loader.
- return;
- }
-
- // Let `url_loader_` handles how to forward the action to the network service.
- url_loader_->PauseReadingBodyFromNet();
-
- if (observer_for_testing_) {
- CHECK_IS_TEST();
- observer_for_testing_->PauseReadingBodyFromNetProcessed(this);
- }
-}
-
-// TODO(crbug.com/40236167): Add test coverage.
-void KeepAliveURLLoader::ResumeReadingBodyFromNet() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- TRACE_EVENT("loading", "KeepAliveURLLoader::ResumeReadingBodyFromNet",
- "request_id", request_id_);
- if (HasReceivedResponse()) {
- // This may come from a renderer that tries to process a redirect which has
- // been previously handled in this loader.
- return;
- }
-
- // Let `url_loader_` handles how to forward the action to the network service.
- url_loader_->ResumeReadingBodyFromNet();
-
- if (observer_for_testing_) {
- CHECK_IS_TEST();
- observer_for_testing_->ResumeReadingBodyFromNetProcessed(this);
- }
-}
-
void KeepAliveURLLoader::EndReceiveRedirect(
const net::RedirectInfo& redirect_info,
network::mojom::URLResponseHeadPtr head) {
diff --git a/content/browser/loader/keep_alive_url_loader.h b/content/browser/loader/keep_alive_url_loader.h
index d80ad375..ab52444 100644
--- a/content/browser/loader/keep_alive_url_loader.h
+++ b/content/browser/loader/keep_alive_url_loader.h
@@ -171,10 +171,6 @@
virtual void OnCompleteProcessed(
KeepAliveURLLoader* loader,
const network::URLLoaderCompletionStatus& completion_status) = 0;
- virtual void PauseReadingBodyFromNetProcessed(
- KeepAliveURLLoader* loader) = 0;
- virtual void ResumeReadingBodyFromNetProcessed(
- KeepAliveURLLoader* loader) = 0;
protected:
virtual ~TestObserver() = default;
@@ -200,8 +196,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// Receives actions from network service, loaded by `url_loader_`.
// `blink::ThrottlingURLLoader::ClientReceiverDelegate` overrides:
diff --git a/content/browser/loader/prefetch_url_loader.cc b/content/browser/loader/prefetch_url_loader.cc
index 00404f3d..12b32fcd 100644
--- a/content/browser/loader/prefetch_url_loader.cc
+++ b/content/browser/loader/prefetch_url_loader.cc
@@ -133,22 +133,6 @@
}
}
-void PrefetchURLLoader::PauseReadingBodyFromNet() {
- // TODO(kinuko): Propagate or handle the case where |loader_| is
- // detached (for SignedExchanges), see OnReceiveResponse.
- if (loader_) {
- loader_->PauseReadingBodyFromNet();
- }
-}
-
-void PrefetchURLLoader::ResumeReadingBodyFromNet() {
- // TODO(kinuko): Propagate or handle the case where |loader_| is
- // detached (for SignedExchanges), see OnReceiveResponse.
- if (loader_) {
- loader_->ResumeReadingBodyFromNet();
- }
-}
-
void PrefetchURLLoader::OnReceiveEarlyHints(
network::mojom::EarlyHintsPtr early_hints) {
forwarding_client_->OnReceiveEarlyHints(std::move(early_hints));
diff --git a/content/browser/loader/prefetch_url_loader.h b/content/browser/loader/prefetch_url_loader.h
index 3a08809..fbe7e358 100644
--- a/content/browser/loader/prefetch_url_loader.h
+++ b/content/browser/loader/prefetch_url_loader.h
@@ -95,8 +95,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient overrides:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
diff --git a/content/browser/loader/subresource_proxying_url_loader.cc b/content/browser/loader/subresource_proxying_url_loader.cc
index 12d8dc0..4de4b610 100644
--- a/content/browser/loader/subresource_proxying_url_loader.cc
+++ b/content/browser/loader/subresource_proxying_url_loader.cc
@@ -78,14 +78,6 @@
loader_->SetPriority(priority, intra_priority_value);
}
-void SubresourceProxyingURLLoader::PauseReadingBodyFromNet() {
- loader_->PauseReadingBodyFromNet();
-}
-
-void SubresourceProxyingURLLoader::ResumeReadingBodyFromNet() {
- loader_->ResumeReadingBodyFromNet();
-}
-
void SubresourceProxyingURLLoader::OnReceiveEarlyHints(
network::mojom::EarlyHintsPtr early_hints) {
forwarding_client_->OnReceiveEarlyHints(std::move(early_hints));
diff --git a/content/browser/loader/subresource_proxying_url_loader.h b/content/browser/loader/subresource_proxying_url_loader.h
index 4f73dd8..820e65c97 100644
--- a/content/browser/loader/subresource_proxying_url_loader.h
+++ b/content/browser/loader/subresource_proxying_url_loader.h
@@ -85,8 +85,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient overrides:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
diff --git a/content/browser/preloading/prefetch/prefetch_response_reader.cc b/content/browser/preloading/prefetch/prefetch_response_reader.cc
index 8d0fe26..2e93c45 100644
--- a/content/browser/preloading/prefetch/prefetch_response_reader.cc
+++ b/content/browser/preloading/prefetch/prefetch_response_reader.cc
@@ -529,20 +529,6 @@
}
}
-void PrefetchResponseReader::PauseReadingBodyFromNet() {
- // Forward calls from the serving URL loader to the prefetch URL loader.
- if (streaming_url_loader_) {
- streaming_url_loader_->PauseReadingBodyFromNet();
- }
-}
-
-void PrefetchResponseReader::ResumeReadingBodyFromNet() {
- // Forward calls from the serving URL loader to the prefetch URL loader.
- if (streaming_url_loader_) {
- streaming_url_loader_->ResumeReadingBodyFromNet();
- }
-}
-
PrefetchStreamingURLLoaderStatus PrefetchResponseReader::GetStatusForRecording()
const {
switch (load_state_) {
diff --git a/content/browser/preloading/prefetch/prefetch_response_reader.h b/content/browser/preloading/prefetch/prefetch_response_reader.h
index 920a80d..9d2d99b9 100644
--- a/content/browser/preloading/prefetch/prefetch_response_reader.h
+++ b/content/browser/preloading/prefetch/prefetch_response_reader.h
@@ -158,8 +158,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void OnServingURLLoaderMojoDisconnect();
diff --git a/content/browser/preloading/prefetch/prefetch_streaming_url_loader.cc b/content/browser/preloading/prefetch/prefetch_streaming_url_loader.cc
index 4130f3df..96b23cb 100644
--- a/content/browser/preloading/prefetch/prefetch_streaming_url_loader.cc
+++ b/content/browser/preloading/prefetch/prefetch_streaming_url_loader.cc
@@ -278,16 +278,4 @@
}
}
-void PrefetchStreamingURLLoader::PauseReadingBodyFromNet() {
- if (prefetch_url_loader_) {
- prefetch_url_loader_->PauseReadingBodyFromNet();
- }
-}
-
-void PrefetchStreamingURLLoader::ResumeReadingBodyFromNet() {
- if (prefetch_url_loader_) {
- prefetch_url_loader_->ResumeReadingBodyFromNet();
- }
-}
-
} // namespace content
diff --git a/content/browser/preloading/prefetch/prefetch_streaming_url_loader.h b/content/browser/preloading/prefetch/prefetch_streaming_url_loader.h
index bc38867..d6f9382 100644
--- a/content/browser/preloading/prefetch/prefetch_streaming_url_loader.h
+++ b/content/browser/preloading/prefetch/prefetch_streaming_url_loader.h
@@ -68,8 +68,6 @@
// Called from PrefetchResponseReader.
void SetPriority(net::RequestPriority priority, int32_t intra_priority_value);
- void PauseReadingBodyFromNet();
- void ResumeReadingBodyFromNet();
base::WeakPtr<PrefetchStreamingURLLoader> GetWeakPtr() {
return weak_ptr_factory_.GetWeakPtr();
diff --git a/content/browser/preloading/prefetch/prefetch_streaming_url_loader_unittest.cc b/content/browser/preloading/prefetch/prefetch_streaming_url_loader_unittest.cc
index bdde626..40c0114 100644
--- a/content/browser/preloading/prefetch/prefetch_streaming_url_loader_unittest.cc
+++ b/content/browser/preloading/prefetch/prefetch_streaming_url_loader_unittest.cc
@@ -53,8 +53,6 @@
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
base::OnceClosure on_follow_redirect_closure_;
diff --git a/content/browser/service_worker/service_worker_installed_script_loader.cc b/content/browser/service_worker/service_worker_installed_script_loader.cc
index 818a338..1df6dd5 100644
--- a/content/browser/service_worker/service_worker_installed_script_loader.cc
+++ b/content/browser/service_worker/service_worker_installed_script_loader.cc
@@ -117,12 +117,4 @@
// Ignore: this class doesn't have a concept of priority.
}
-void ServiceWorkerInstalledScriptLoader::PauseReadingBodyFromNet() {
- // Ignore: this class doesn't read from network.
-}
-
-void ServiceWorkerInstalledScriptLoader::ResumeReadingBodyFromNet() {
- // Ignore: this class doesn't read from network.
-}
-
} // namespace content
diff --git a/content/browser/service_worker/service_worker_installed_script_loader.h b/content/browser/service_worker/service_worker_installed_script_loader.h
index 233213c..4381f71b 100644
--- a/content/browser/service_worker/service_worker_installed_script_loader.h
+++ b/content/browser/service_worker/service_worker_installed_script_loader.h
@@ -63,8 +63,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
private:
// mojo::DataPipeDrainer::Client overrides:
diff --git a/content/browser/service_worker/service_worker_main_resource_loader.cc b/content/browser/service_worker/service_worker_main_resource_loader.cc
index 3784141..cbcc3b3 100644
--- a/content/browser/service_worker/service_worker_main_resource_loader.cc
+++ b/content/browser/service_worker/service_worker_main_resource_loader.cc
@@ -1104,10 +1104,6 @@
NOTIMPLEMENTED();
}
-void ServiceWorkerMainResourceLoader::PauseReadingBodyFromNet() {}
-
-void ServiceWorkerMainResourceLoader::ResumeReadingBodyFromNet() {}
-
void ServiceWorkerMainResourceLoader::OnBlobReadingComplete(int net_error) {
CommitCompleted(net_error, "Blob has been read.");
body_as_blob_.reset();
diff --git a/content/browser/service_worker/service_worker_main_resource_loader.h b/content/browser/service_worker/service_worker_main_resource_loader.h
index 64099d1..434d3be 100644
--- a/content/browser/service_worker/service_worker_main_resource_loader.h
+++ b/content/browser/service_worker/service_worker_main_resource_loader.h
@@ -172,8 +172,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void OnBlobReadingComplete(int net_error);
diff --git a/content/browser/service_worker/service_worker_new_script_loader.cc b/content/browser/service_worker/service_worker_new_script_loader.cc
index 1eccb131..b668d62 100644
--- a/content/browser/service_worker/service_worker_new_script_loader.cc
+++ b/content/browser/service_worker/service_worker_new_script_loader.cc
@@ -236,26 +236,6 @@
network_loader_->SetPriority(priority, intra_priority_value);
}
-void ServiceWorkerNewScriptLoader::PauseReadingBodyFromNet() {
- TRACE_EVENT_WITH_FLOW0(
- "ServiceWorker", "ServiceWorkerNewScriptLoader::PauseReadingBodyFromNet",
- TRACE_ID_WITH_SCOPE(kServiceWorkerNewScriptLoaderScope,
- TRACE_ID_LOCAL(request_id_)),
- TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
- if (network_loader_)
- network_loader_->PauseReadingBodyFromNet();
-}
-
-void ServiceWorkerNewScriptLoader::ResumeReadingBodyFromNet() {
- TRACE_EVENT_WITH_FLOW0(
- "ServiceWorker", "ServiceWorkerNewScriptLoader::ResumeReadingBodyFromNet",
- TRACE_ID_WITH_SCOPE(kServiceWorkerNewScriptLoaderScope,
- TRACE_ID_LOCAL(request_id_)),
- TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
- if (network_loader_)
- network_loader_->ResumeReadingBodyFromNet();
-}
-
// URLLoaderClient for network loader ------------------------------------------
void ServiceWorkerNewScriptLoader::OnReceiveEarlyHints(
diff --git a/content/browser/service_worker/service_worker_new_script_loader.h b/content/browser/service_worker/service_worker_new_script_loader.h
index 05e4d61..d5e170b9 100644
--- a/content/browser/service_worker/service_worker_new_script_loader.h
+++ b/content/browser/service_worker/service_worker_new_script_loader.h
@@ -111,8 +111,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient for the network load:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
diff --git a/content/browser/service_worker/service_worker_updated_script_loader.cc b/content/browser/service_worker/service_worker_updated_script_loader.cc
index 18d39e8..a9778247 100644
--- a/content/browser/service_worker/service_worker_updated_script_loader.cc
+++ b/content/browser/service_worker/service_worker_updated_script_loader.cc
@@ -153,16 +153,6 @@
network_loader_->SetPriority(priority, intra_priority_value);
}
-void ServiceWorkerUpdatedScriptLoader::PauseReadingBodyFromNet() {
- if (network_loader_)
- network_loader_->PauseReadingBodyFromNet();
-}
-
-void ServiceWorkerUpdatedScriptLoader::ResumeReadingBodyFromNet() {
- if (network_loader_)
- network_loader_->ResumeReadingBodyFromNet();
-}
-
// URLLoaderClient for network loader ------------------------------------------
void ServiceWorkerUpdatedScriptLoader::OnReceiveEarlyHints(
diff --git a/content/browser/service_worker/service_worker_updated_script_loader.h b/content/browser/service_worker/service_worker_updated_script_loader.h
index 48ab6ca..51986c2 100644
--- a/content/browser/service_worker/service_worker_updated_script_loader.h
+++ b/content/browser/service_worker/service_worker_updated_script_loader.h
@@ -94,8 +94,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient for the network load:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
diff --git a/content/browser/web_package/prefetched_signed_exchange_cache.cc b/content/browser/web_package/prefetched_signed_exchange_cache.cc
index cbc1d8e4..0dca4486 100644
--- a/content/browser/web_package/prefetched_signed_exchange_cache.cc
+++ b/content/browser/web_package/prefetched_signed_exchange_cache.cc
@@ -107,14 +107,6 @@
int intra_priority_value) override {
// There is nothing to do, because this class just calls OnReceiveRedirect.
}
- void PauseReadingBodyFromNet() override {
- // There is nothing to do, because we don't fetch the resource from the
- // network.
- }
- void ResumeReadingBodyFromNet() override {
- // There is nothing to do, because we don't fetch the resource from the
- // network.
- }
mojo::Remote<network::mojom::URLLoaderClient> client_;
};
diff --git a/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc b/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
index 91ea408..0a58cc8 100644
--- a/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
+++ b/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
@@ -107,8 +107,6 @@
MOCK_METHOD2(SetPriority,
void(net::RequestPriority priority,
int32_t intra_priority_value));
- MOCK_METHOD0(PauseReadingBodyFromNet, void());
- MOCK_METHOD0(ResumeReadingBodyFromNet, void());
private:
mojo::Receiver<network::mojom::URLLoader> receiver_;
diff --git a/content/browser/web_package/signed_exchange_inner_response_url_loader.cc b/content/browser/web_package/signed_exchange_inner_response_url_loader.cc
index 6057d529..1e511e8 100644
--- a/content/browser/web_package/signed_exchange_inner_response_url_loader.cc
+++ b/content/browser/web_package/signed_exchange_inner_response_url_loader.cc
@@ -178,16 +178,6 @@
// reading a blob.
}
-void SignedExchangeInnerResponseURLLoader::PauseReadingBodyFromNet() {
- // There is nothing to do, because we don't fetch the resource from the
- // network.
-}
-
-void SignedExchangeInnerResponseURLLoader::ResumeReadingBodyFromNet() {
- // There is nothing to do, because we don't fetch the resource from the
- // network.
-}
-
void SignedExchangeInnerResponseURLLoader::SendResponseBody() {
mojo::ScopedDataPipeProducerHandle pipe_producer_handle;
mojo::ScopedDataPipeConsumerHandle pipe_consumer_handle;
diff --git a/content/browser/web_package/signed_exchange_inner_response_url_loader.h b/content/browser/web_package/signed_exchange_inner_response_url_loader.h
index b93cca5..a3fe0a19 100644
--- a/content/browser/web_package/signed_exchange_inner_response_url_loader.h
+++ b/content/browser/web_package/signed_exchange_inner_response_url_loader.h
@@ -69,8 +69,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void SendResponseBody();
diff --git a/content/browser/web_package/signed_exchange_loader.cc b/content/browser/web_package/signed_exchange_loader.cc
index dd9c898..1819214 100644
--- a/content/browser/web_package/signed_exchange_loader.cc
+++ b/content/browser/web_package/signed_exchange_loader.cc
@@ -205,14 +205,6 @@
url_loader_->SetPriority(priority, intra_priority_value);
}
-void SignedExchangeLoader::PauseReadingBodyFromNet() {
- url_loader_->PauseReadingBodyFromNet();
-}
-
-void SignedExchangeLoader::ResumeReadingBodyFromNet() {
- url_loader_->ResumeReadingBodyFromNet();
-}
-
void SignedExchangeLoader::ConnectToClient(
mojo::PendingRemote<network::mojom::URLLoaderClient> client) {
DCHECK(pending_client_receiver_.is_valid());
diff --git a/content/browser/web_package/signed_exchange_loader.h b/content/browser/web_package/signed_exchange_loader.h
index d936e54..d12e4843 100644
--- a/content/browser/web_package/signed_exchange_loader.h
+++ b/content/browser/web_package/signed_exchange_loader.h
@@ -107,8 +107,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void ConnectToClient(
mojo::PendingRemote<network::mojom::URLLoaderClient> client);
diff --git a/content/browser/web_package/signed_exchange_loader_unittest.cc b/content/browser/web_package/signed_exchange_loader_unittest.cc
index 821f1df9..50bdcef 100644
--- a/content/browser/web_package/signed_exchange_loader_unittest.cc
+++ b/content/browser/web_package/signed_exchange_loader_unittest.cc
@@ -90,8 +90,6 @@
MOCK_METHOD2(SetPriority,
void(net::RequestPriority priority,
int32_t intra_priority_value));
- MOCK_METHOD0(PauseReadingBodyFromNet, void());
- MOCK_METHOD0(ResumeReadingBodyFromNet, void());
private:
mojo::Receiver<network::mojom::URLLoader> receiver_;
@@ -148,12 +146,6 @@
std::string() /* accept_langs */,
false /* keep_entry_for_prefetch_cache */);
- EXPECT_CALL(mock_loader, PauseReadingBodyFromNet());
- signed_exchange_loader->PauseReadingBodyFromNet();
-
- EXPECT_CALL(mock_loader, ResumeReadingBodyFromNet());
- signed_exchange_loader->ResumeReadingBodyFromNet();
-
constexpr int kIntraPriority = 5;
EXPECT_CALL(mock_loader,
SetPriority(net::RequestPriority::HIGHEST, kIntraPriority));
diff --git a/content/browser/worker_host/worker_script_loader.cc b/content/browser/worker_host/worker_script_loader.cc
index c990a84..fc0db11a 100644
--- a/content/browser/worker_host/worker_script_loader.cc
+++ b/content/browser/worker_host/worker_script_loader.cc
@@ -199,18 +199,6 @@
if (url_loader_)
url_loader_->SetPriority(priority, intra_priority_value);
}
-
-void WorkerScriptLoader::PauseReadingBodyFromNet() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (url_loader_)
- url_loader_->PauseReadingBodyFromNet();
-}
-
-void WorkerScriptLoader::ResumeReadingBodyFromNet() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- if (url_loader_)
- url_loader_->ResumeReadingBodyFromNet();
-}
// URLLoader end --------------------------------------------------------------
// URLLoaderClient ------------------------------------------------------------
diff --git a/content/browser/worker_host/worker_script_loader.h b/content/browser/worker_host/worker_script_loader.h
index 829490e..c32f145 100644
--- a/content/browser/worker_host/worker_script_loader.h
+++ b/content/browser/worker_host/worker_script_loader.h
@@ -89,8 +89,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override;
diff --git a/content/public/test/keep_alive_url_loader_utils.cc b/content/public/test/keep_alive_url_loader_utils.cc
index c629b27..1c08228 100644
--- a/content/public/test/keep_alive_url_loader_utils.cc
+++ b/content/public/test/keep_alive_url_loader_utils.cc
@@ -135,14 +135,6 @@
EXPECT_THAT(on_complete_processed_status_,
testing::Pointwise(ErrorCodeEq(), error_codes));
}
- // Waits for `PauseReadingBodyFromNetProcessed()` to be called `total` times.
- void WaitForTotalPauseReadingBodyFromNetProcessed(size_t total) {
- pause_reading_body_from_net_processed_count_.WaitUntil(total);
- }
- // Waits for `ResumeReadingBodyFromNetProcessed()` to be called `total` times.
- void WaitForTotalResumeReadingBodyFromNetProcessed(size_t total) {
- resume_reading_body_from_net_processed_count_.WaitUntil(total);
- }
private:
~TestObserverImpl() override = default;
@@ -182,13 +174,6 @@
on_complete_processed_status_.push_back(completion_status);
}
- void PauseReadingBodyFromNetProcessed(KeepAliveURLLoader* loader) override {
- pause_reading_body_from_net_processed_count_.Increment();
- }
- void ResumeReadingBodyFromNetProcessed(KeepAliveURLLoader* loader) override {
- resume_reading_body_from_net_processed_count_.Increment();
- }
-
// OnReceiveRedirect*:
AtomicCounter on_receive_redirect_forwarded_count_;
AtomicCounter on_receive_redirect_processed_count_;
@@ -201,9 +186,6 @@
AtomicCounter on_complete_forwarded_count_;
AtomicCounter on_complete_processed_count_;
- AtomicCounter pause_reading_body_from_net_processed_count_;
- AtomicCounter resume_reading_body_from_net_processed_count_;
-
std::vector<network::URLLoaderCompletionStatus> on_complete_status_;
std::vector<network::URLLoaderCompletionStatus> on_complete_forwarded_status_;
std::vector<network::URLLoaderCompletionStatus> on_complete_processed_status_;
@@ -275,14 +257,4 @@
impl_->get()->WaitForTotalOnCompleteProcessed(error_codes);
}
-void KeepAliveURLLoadersTestObserver::
- WaitForTotalPauseReadingBodyFromNetProcessed(size_t total) {
- impl_->get()->WaitForTotalPauseReadingBodyFromNetProcessed(total);
-}
-
-void KeepAliveURLLoadersTestObserver::
- WaitForTotalResumeReadingBodyFromNetProcessed(size_t total) {
- impl_->get()->WaitForTotalResumeReadingBodyFromNetProcessed(total);
-}
-
} // namespace content
diff --git a/content/public/test/keep_alive_url_loader_utils.h b/content/public/test/keep_alive_url_loader_utils.h
index 4713ef5..6e1925e4 100644
--- a/content/public/test/keep_alive_url_loader_utils.h
+++ b/content/public/test/keep_alive_url_loader_utils.h
@@ -72,12 +72,6 @@
// `error_codes.size()` times, and the error codes from all previous calls to
// that method should match `error_codes`.
void WaitForTotalOnCompleteProcessed(const std::vector<int>& error_codes);
- // Waits for `KeepAliveURLLoader::PauseReadingBodyFromNetProcessed()` to be
- // called `total` times.
- void WaitForTotalPauseReadingBodyFromNetProcessed(size_t total);
- // Waits for `KeepAliveURLLoader::ResumeReadingBodyFromNetProcessed()` to be
- // called `total` times.
- void WaitForTotalResumeReadingBodyFromNetProcessed(size_t total);
private:
std::unique_ptr<KeepAliveURLLoadersTestObserverImpl> impl_;
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.cc b/content/renderer/service_worker/service_worker_subresource_loader.cc
index e938fc31..48a7030c 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader.cc
+++ b/content/renderer/service_worker/service_worker_subresource_loader.cc
@@ -1306,10 +1306,6 @@
// Not supported (do nothing).
}
-void ServiceWorkerSubresourceLoader::PauseReadingBodyFromNet() {}
-
-void ServiceWorkerSubresourceLoader::ResumeReadingBodyFromNet() {}
-
int ServiceWorkerSubresourceLoader::StartBlobReading(
mojo::ScopedDataPipeConsumerHandle* body_pipe) {
TRACE_EVENT_WITH_FLOW0(
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.h b/content/renderer/service_worker/service_worker_subresource_loader.h
index edc4d211..c9fe00f 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader.h
+++ b/content/renderer/service_worker/service_worker_subresource_loader.h
@@ -135,8 +135,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
int StartBlobReading(mojo::ScopedDataPipeConsumerHandle* body_pipe);
void OnSideDataReadingComplete(mojo::ScopedDataPipeConsumerHandle data_pipe,
diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
index c1357890..b54ffcb 100644
--- a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
+++ b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
@@ -397,20 +397,6 @@
}
}
-void WebRequestProxyingURLLoaderFactory::InProgressRequest::
- PauseReadingBodyFromNet() {
- if (target_loader_.is_bound()) {
- target_loader_->PauseReadingBodyFromNet();
- }
-}
-
-void WebRequestProxyingURLLoaderFactory::InProgressRequest::
- ResumeReadingBodyFromNet() {
- if (target_loader_.is_bound()) {
- target_loader_->ResumeReadingBodyFromNet();
- }
-}
-
void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveEarlyHints(
network::mojom::EarlyHintsPtr early_hints) {
target_client_->OnReceiveEarlyHints(std::move(early_hints));
diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h
index f88e9e9..c7ee7d43 100644
--- a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h
+++ b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h
@@ -106,8 +106,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// network::mojom::URLLoaderClient:
void OnReceiveEarlyHints(
diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc
index 1f0fbbae..05d8644 100644
--- a/extensions/browser/extension_protocols.cc
+++ b/extensions/browser/extension_protocols.cc
@@ -547,8 +547,6 @@
}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
~ExtensionURLLoader() override = default;
diff --git a/extensions/renderer/extension_localization_throttle.cc b/extensions/renderer/extension_localization_throttle.cc
index 3a0abab..02e840e 100644
--- a/extensions/renderer/extension_localization_throttle.cc
+++ b/extensions/renderer/extension_localization_throttle.cc
@@ -122,12 +122,6 @@
int32_t intra_priority_value) override {
source_url_loader_->SetPriority(priority, intra_priority_value);
}
- void PauseReadingBodyFromNet() override {
- source_url_loader_->PauseReadingBodyFromNet();
- }
- void ResumeReadingBodyFromNet() override {
- source_url_loader_->ResumeReadingBodyFromNet();
- }
// mojo::DataPipeDrainer
void OnDataAvailable(base::span<const uint8_t> data) override {
diff --git a/extensions/renderer/extension_localization_throttle_unittest.cc b/extensions/renderer/extension_localization_throttle_unittest.cc
index d08ac277..3ef09a2 100644
--- a/extensions/renderer/extension_localization_throttle_unittest.cc
+++ b/extensions/renderer/extension_localization_throttle_unittest.cc
@@ -23,12 +23,6 @@
class FakeURLLoader final : public network::mojom::URLLoader {
public:
- enum class Status {
- kInitial,
- kPauseReading,
- kResumeReading,
- };
-
explicit FakeURLLoader(
mojo::PendingReceiver<network::mojom::URLLoader> url_loader_receiver)
: receiver_(this, std::move(url_loader_receiver)) {}
@@ -49,18 +43,12 @@
int32_t intra_priority_value) override {
set_priority_called_ = true;
}
- void PauseReadingBodyFromNet() override { status_ = Status::kPauseReading; }
- void ResumeReadingBodyFromNet() override { status_ = Status::kResumeReading; }
bool set_priority_called() const { return set_priority_called_; }
- Status status() const { return status_; }
-
private:
bool set_priority_called_ = false;
- Status status_ = Status::kInitial;
-
mojo::Receiver<network::mojom::URLLoader> receiver_;
};
@@ -447,20 +435,11 @@
ASSERT_TRUE(source_url_loader);
EXPECT_FALSE(source_url_loader->set_priority_called());
- EXPECT_EQ(FakeURLLoader::Status::kInitial, source_url_loader->status());
destination_loader_remote->SetPriority(net::LOW, 1);
task_environment_.RunUntilIdle();
EXPECT_TRUE(source_url_loader->set_priority_called());
- destination_loader_remote->PauseReadingBodyFromNet();
- task_environment_.RunUntilIdle();
- EXPECT_EQ(FakeURLLoader::Status::kPauseReading, source_url_loader->status());
-
- destination_loader_remote->ResumeReadingBodyFromNet();
- task_environment_.RunUntilIdle();
- EXPECT_EQ(FakeURLLoader::Status::kResumeReading, source_url_loader->status());
-
delegate->LoadResponseBody("__MSG_hello__!");
delegate->CompleteResponse();
delegate->destination_loader_client()->RunUntilComplete();
diff --git a/fuchsia_web/webengine/browser/content_directory_loader_factory.cc b/fuchsia_web/webengine/browser/content_directory_loader_factory.cc
index 9a0dc71..9e2a488 100644
--- a/fuchsia_web/webengine/browser/content_directory_loader_factory.cc
+++ b/fuchsia_web/webengine/browser/content_directory_loader_factory.cc
@@ -266,8 +266,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
// Called when body_writer_->Write() has completed asynchronously.
diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
index e34930e..f29a82f 100644
--- a/services/network/cors/cors_url_loader.cc
+++ b/services/network/cors/cors_url_loader.cc
@@ -563,16 +563,6 @@
network_loader_->SetPriority(priority, intra_priority_value);
}
-void CorsURLLoader::PauseReadingBodyFromNet() {
- if (network_loader_)
- network_loader_->PauseReadingBodyFromNet();
-}
-
-void CorsURLLoader::ResumeReadingBodyFromNet() {
- if (network_loader_)
- network_loader_->ResumeReadingBodyFromNet();
-}
-
void CorsURLLoader::OnReceiveEarlyHints(mojom::EarlyHintsPtr early_hints) {
DCHECK(network_loader_);
DCHECK(forwarding_client_);
diff --git a/services/network/cors/cors_url_loader.h b/services/network/cors/cors_url_loader.h
index 7fb733ba..8d509d4d 100644
--- a/services/network/cors/cors_url_loader.h
+++ b/services/network/cors/cors_url_loader.h
@@ -110,8 +110,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// mojom::URLLoaderClient overrides:
void OnReceiveEarlyHints(mojom::EarlyHintsPtr early_hints) override;
diff --git a/services/network/prefetch_url_loader_client_unittest.cc b/services/network/prefetch_url_loader_client_unittest.cc
index d1ea04e..ed1524ab 100644
--- a/services/network/prefetch_url_loader_client_unittest.cc
+++ b/services/network/prefetch_url_loader_client_unittest.cc
@@ -229,8 +229,6 @@
const std::optional<GURL>& new_url) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
mojo::Receiver<network::mojom::URLLoader> receiver_;
diff --git a/services/network/public/cpp/simple_url_loader_unittest.cc b/services/network/public/cpp/simple_url_loader_unittest.cc
index 3420b89..ea4d76a 100644
--- a/services/network/public/cpp/simple_url_loader_unittest.cc
+++ b/services/network/public/cpp/simple_url_loader_unittest.cc
@@ -2350,8 +2350,6 @@
int32_t intra_priority_value) override {
NOTREACHED();
}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
network::mojom::URLLoaderClient* client() const { return client_.get(); }
diff --git a/services/network/public/mojom/url_loader.mojom b/services/network/public/mojom/url_loader.mojom
index 45bd15e..f13822b5 100644
--- a/services/network/public/mojom/url_loader.mojom
+++ b/services/network/public/mojom/url_loader.mojom
@@ -53,24 +53,6 @@
// requests within a given priority level. If -1 is passed, the existing
// intra priority value is maintained.
SetPriority(RequestPriority priority, int32 intra_priority_value);
-
- // If the resource is being fetched from the network,
- // PauseReadingBodyFromNet() pauses fetching the response body. It is okay to
- // call this method before fetching the body starts, too.
- // ResumeReadingBodyFromNet() resumes fetching the body if it has been paused.
- //
- // Note that PauseReadingBodyFromNet() is asynchronous and only gurantees to
- // pause if the response body is fetched from the network. This means:
- // - any data in flight before PauseReadingBodyFromNet() is processed will
- // still be passed to the client data pipe.
- // - a response body not from the network, e.g. from blob, may not be paused
- // at all.
- //
- // Redundant calls to these methods are ingored. It is not required to match
- // pause and resume calls. It is not an error to resume a non-paused request,
- // or pause a request multiple times.
- PauseReadingBodyFromNet();
- ResumeReadingBodyFromNet();
};
// Receives messages from a single URLLoader.
diff --git a/services/network/test/test_url_loader_factory.h b/services/network/test/test_url_loader_factory.h
index 5248dcc..9ee2424 100644
--- a/services/network/test/test_url_loader_factory.h
+++ b/services/network/test/test_url_loader_factory.h
@@ -60,8 +60,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
const std::vector<FollowRedirectParams>& follow_redirect_params() const {
return follow_redirect_params_;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index e9653a1..d8d746f 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -1496,30 +1496,6 @@
}
}
-void URLLoader::PauseReadingBodyFromNet() {
- DVLOG(1) << "URLLoader pauses fetching response body for "
- << (url_request_ ? url_request_->original_url().spec()
- : "a URL that has completed loading or failed.");
-
- // Please note that we pause reading body in all cases. Even if the URL
- // request indicates that the response was cached, there could still be
- // network activity involved. For example, the response was only partially
- // cached.
- should_pause_reading_body_ = true;
-}
-
-void URLLoader::ResumeReadingBodyFromNet() {
- DVLOG(1) << "URLLoader resumes fetching response body for "
- << (url_request_ ? url_request_->original_url().spec()
- : "a URL that has completed loading or failed.");
- should_pause_reading_body_ = false;
-
- if (paused_reading_body_) {
- paused_reading_body_ = false;
- ReadMore();
- }
-}
-
PrivateNetworkAccessCheckResult URLLoader::PrivateNetworkAccessCheck(
const net::TransportInfo& transport_info) {
PrivateNetworkAccessCheckResult result =
@@ -2256,11 +2232,6 @@
// the network.
DCHECK(consumer_handle_.is_valid() || !pending_write_);
- if (should_pause_reading_body_) {
- paused_reading_body_ = true;
- return;
- }
-
// TODO(ricea): Refactor this method and DidRead() to reduce duplication.
if (options_ & mojom::kURLLoadOptionReadAndDiscardBody) {
read_in_progress_ = true;
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
index c68620103..6dc9341d 100644
--- a/services/network/url_loader.h
+++ b/services/network/url_loader.h
@@ -197,8 +197,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
// net::URLRequest::Delegate implementation:
int OnConnected(net::URLRequest* url_request,
@@ -740,10 +738,6 @@
const int32_t options_;
- bool should_pause_reading_body_ = false;
- // The response body stream is open, but transferring data is paused.
- bool paused_reading_body_ = false;
-
// This is used to compute the delta since last time received
// encoded body size was reported to the client.
int64_t reported_total_encoded_bytes_ = 0;
diff --git a/services/network/url_loader_unittest.cc b/services/network/url_loader_unittest.cc
index c57f9c8..8d80c02 100644
--- a/services/network/url_loader_unittest.cc
+++ b/services/network/url_loader_unittest.cc
@@ -2787,228 +2787,6 @@
EXPECT_EQ(net::ERR_FAILED, client()->completion_status().error_code);
}
-TEST_P(ParameterizedURLLoaderTest,
- PauseReadingBodyFromNetBeforeResponseHeaders) {
- const char* const kPath = "/hello.html";
- const char* const kBodyContents = "This is the data as you requested.";
-
- net::EmbeddedTestServer server;
- net::test_server::ControllableHttpResponse response_controller(&server,
- kPath);
- ASSERT_TRUE(server.Start());
-
- ResourceRequest request = CreateResourceRequest("GET", server.GetURL(kPath));
-
- base::RunLoop delete_run_loop;
- mojo::Remote<mojom::URLLoader> loader;
- std::unique_ptr<URLLoader> url_loader;
- context().mutable_factory_params().process_id = mojom::kBrowserProcessId;
- context().mutable_factory_params().is_orb_enabled = false;
- url_loader = URLLoaderOptions().MakeURLLoader(
- context(), DeleteLoaderCallback(&delete_run_loop, &url_loader),
- loader.BindNewPipeAndPassReceiver(), request, client()->CreateRemote());
-
- // Pausing reading response body from network stops future reads from the
- // underlying URLRequest. So no data should be sent using the response body
- // data pipe.
- loader->PauseReadingBodyFromNet();
- // In order to avoid flakiness, make sure PauseReadBodyFromNet() is handled by
- // the loader before the test HTTP server serves the response.
- loader.FlushForTesting();
-
- response_controller.WaitForRequest();
- response_controller.Send(
- "HTTP/1.1 200 OK\r\n"
- "Content-Type: text/plain\r\n\r\n" +
- std::string(kBodyContents));
- response_controller.Done();
-
- // We will still receive the response body data pipe, although there won't be
- // any data available until ResumeReadBodyFromNet() is called.
- client()->RunUntilResponseBodyArrived();
- EXPECT_TRUE(client()->has_received_response());
- EXPECT_FALSE(client()->has_received_completion());
-
- // Wait for a little amount of time so that if the loader mistakenly reads
- // response body from the underlying URLRequest, it is easier to find out.
- base::RunLoop run_loop;
- base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
- FROM_HERE, run_loop.QuitClosure(), base::Milliseconds(100));
- run_loop.Run();
-
- std::string available_data = ReadAvailableBody();
- EXPECT_TRUE(available_data.empty());
-
- loader->ResumeReadingBodyFromNet();
- client()->RunUntilComplete();
-
- available_data = ReadBody();
- EXPECT_EQ(kBodyContents, available_data);
-
- delete_run_loop.Run();
- client()->Unbind();
-}
-
-TEST_P(ParameterizedURLLoaderTest, PauseReadingBodyFromNetWhenReadIsPending) {
- const char* const kPath = "/hello.html";
- const char* const kBodyContentsFirstHalf = "This is the first half.";
- const char* const kBodyContentsSecondHalf = "This is the second half.";
-
- net::EmbeddedTestServer server;
- net::test_server::ControllableHttpResponse response_controller(&server,
- kPath);
- ASSERT_TRUE(server.Start());
-
- ResourceRequest request = CreateResourceRequest("GET", server.GetURL(kPath));
-
- base::RunLoop delete_run_loop;
- mojo::Remote<mojom::URLLoader> loader;
- std::unique_ptr<URLLoader> url_loader;
- context().mutable_factory_params().process_id = mojom::kBrowserProcessId;
- context().mutable_factory_params().is_orb_enabled = false;
- url_loader = URLLoaderOptions().MakeURLLoader(
- context(), DeleteLoaderCallback(&delete_run_loop, &url_loader),
- loader.BindNewPipeAndPassReceiver(), request, client()->CreateRemote());
-
- response_controller.WaitForRequest();
- response_controller.Send(
- "HTTP/1.1 200 OK\r\n"
- "Content-Type: text/plain\r\n\r\n" +
- std::string(kBodyContentsFirstHalf));
-
- client()->RunUntilResponseBodyArrived();
- EXPECT_TRUE(client()->has_received_response());
- EXPECT_FALSE(client()->has_received_completion());
-
- loader->PauseReadingBodyFromNet();
- loader.FlushForTesting();
-
- response_controller.Send(kBodyContentsSecondHalf);
- response_controller.Done();
-
- // It is uncertain how much data has been read before reading is actually
- // paused, because if there is a pending read when PauseReadingBodyFromNet()
- // arrives, the pending read won't be cancelled. Therefore, this test only
- // checks that after ResumeReadingBodyFromNet() we should be able to get the
- // whole response body.
- loader->ResumeReadingBodyFromNet();
- client()->RunUntilComplete();
-
- EXPECT_EQ(std::string(kBodyContentsFirstHalf) +
- std::string(kBodyContentsSecondHalf),
- ReadBody());
-
- delete_run_loop.Run();
- client()->Unbind();
-}
-
-TEST_P(ParameterizedURLLoaderTest,
- ResumeReadingBodyFromNetAfterClosingConsumer) {
- const char* const kPath = "/hello.html";
- const char* const kBodyContentsFirstHalf = "This is the first half.";
-
- net::EmbeddedTestServer server;
- net::test_server::ControllableHttpResponse response_controller(&server,
- kPath);
- ASSERT_TRUE(server.Start());
-
- ResourceRequest request = CreateResourceRequest("GET", server.GetURL(kPath));
-
- base::RunLoop delete_run_loop;
- mojo::Remote<mojom::URLLoader> loader;
- std::unique_ptr<URLLoader> url_loader;
- context().mutable_factory_params().process_id = mojom::kBrowserProcessId;
- context().mutable_factory_params().is_orb_enabled = false;
- url_loader = URLLoaderOptions().MakeURLLoader(
- context(), DeleteLoaderCallback(&delete_run_loop, &url_loader),
- loader.BindNewPipeAndPassReceiver(), request, client()->CreateRemote());
-
- loader->PauseReadingBodyFromNet();
- loader.FlushForTesting();
-
- response_controller.WaitForRequest();
- response_controller.Send(
- "HTTP/1.1 200 OK\r\n"
- "Content-Type: text/plain\r\n\r\n" +
- std::string(kBodyContentsFirstHalf));
-
- client()->RunUntilResponseBodyArrived();
- EXPECT_TRUE(client()->has_received_response());
- EXPECT_FALSE(client()->has_received_completion());
-
- auto response_body = client()->response_body_release();
- response_body.reset();
-
- // It shouldn't cause any issue even if a ResumeReadingBodyFromNet() call is
- // made after the response body data pipe is closed.
- loader->ResumeReadingBodyFromNet();
- loader.FlushForTesting();
-
- loader.reset();
- client()->Unbind();
- delete_run_loop.Run();
-}
-
-TEST_P(ParameterizedURLLoaderTest, MultiplePauseResumeReadingBodyFromNet) {
- const char* const kPath = "/hello.html";
- const char* const kBodyContentsFirstHalf = "This is the first half.";
- const char* const kBodyContentsSecondHalf = "This is the second half.";
-
- net::EmbeddedTestServer server;
- net::test_server::ControllableHttpResponse response_controller(&server,
- kPath);
- ASSERT_TRUE(server.Start());
-
- ResourceRequest request = CreateResourceRequest("GET", server.GetURL(kPath));
-
- base::RunLoop delete_run_loop;
- mojo::Remote<mojom::URLLoader> loader;
- std::unique_ptr<URLLoader> url_loader;
- context().mutable_factory_params().process_id = mojom::kBrowserProcessId;
- context().mutable_factory_params().is_orb_enabled = false;
- url_loader = URLLoaderOptions().MakeURLLoader(
- context(), DeleteLoaderCallback(&delete_run_loop, &url_loader),
- loader.BindNewPipeAndPassReceiver(), request, client()->CreateRemote());
-
- // It is okay to call ResumeReadingBodyFromNet() even if there is no prior
- // PauseReadingBodyFromNet().
- loader->ResumeReadingBodyFromNet();
- loader.FlushForTesting();
-
- response_controller.WaitForRequest();
- response_controller.Send(
- "HTTP/1.1 200 OK\r\n"
- "Content-Type: text/plain\r\n\r\n" +
- std::string(kBodyContentsFirstHalf));
-
- loader->PauseReadingBodyFromNet();
-
- client()->RunUntilResponseBodyArrived();
- EXPECT_TRUE(client()->has_received_response());
- EXPECT_FALSE(client()->has_received_completion());
-
- loader->PauseReadingBodyFromNet();
- loader->PauseReadingBodyFromNet();
- loader.FlushForTesting();
-
- response_controller.Send(kBodyContentsSecondHalf);
- response_controller.Done();
-
- // One ResumeReadingBodyFromNet() call will resume reading even if there are
- // multiple PauseReadingBodyFromNet() calls before it.
- loader->ResumeReadingBodyFromNet();
-
- delete_run_loop.Run();
- client()->RunUntilComplete();
-
- EXPECT_EQ(std::string(kBodyContentsFirstHalf) +
- std::string(kBodyContentsSecondHalf),
- ReadBody());
-
- loader.reset();
- client()->Unbind();
-}
-
TEST_P(ParameterizedURLLoaderTest, UploadBytes) {
const std::string kRequestBody = "Request Body";
diff --git a/services/network/web_bundle/web_bundle_url_loader_factory.cc b/services/network/web_bundle/web_bundle_url_loader_factory.cc
index d2f2177..f8309ec8 100644
--- a/services/network/web_bundle/web_bundle_url_loader_factory.cc
+++ b/services/network/web_bundle/web_bundle_url_loader_factory.cc
@@ -339,9 +339,6 @@
// Not supported (do nothing).
}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
-
void OnMojoDisconnect() { deleteThis(); }
const GURL url_;
diff --git a/storage/browser/blob/blob_url_loader.h b/storage/browser/blob/blob_url_loader.h
index b6720a5..0d2079f 100644
--- a/storage/browser/blob/blob_url_loader.h
+++ b/storage/browser/blob/blob_url_loader.h
@@ -63,8 +63,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
// MojoBlobReader::Delegate implementation:
RequestSideData DidCalculateSize(uint64_t total_size,
diff --git a/third_party/blink/common/loader/mime_sniffing_url_loader.cc b/third_party/blink/common/loader/mime_sniffing_url_loader.cc
index 67fcec8..4d1a686c 100644
--- a/third_party/blink/common/loader/mime_sniffing_url_loader.cc
+++ b/third_party/blink/common/loader/mime_sniffing_url_loader.cc
@@ -178,18 +178,6 @@
source_url_loader_->SetPriority(priority, intra_priority_value);
}
-void MimeSniffingURLLoader::PauseReadingBodyFromNet() {
- if (state_ == State::kAborted)
- return;
- source_url_loader_->PauseReadingBodyFromNet();
-}
-
-void MimeSniffingURLLoader::ResumeReadingBodyFromNet() {
- if (state_ == State::kAborted)
- return;
- source_url_loader_->ResumeReadingBodyFromNet();
-}
-
void MimeSniffingURLLoader::OnBodyReadable(MojoResult) {
if (state_ == State::kSending) {
// The pipe becoming readable when kSending means all buffered body has
diff --git a/third_party/blink/common/loader/throttling_url_loader.cc b/third_party/blink/common/loader/throttling_url_loader.cc
index e02b739..15b7c1bb 100644
--- a/third_party/blink/common/loader/throttling_url_loader.cc
+++ b/third_party/blink/common/loader/throttling_url_loader.cc
@@ -966,18 +966,6 @@
body_ = std::move(body);
}
-void ThrottlingURLLoader::PauseReadingBodyFromNet() {
- if (url_loader_) {
- url_loader_->PauseReadingBodyFromNet();
- }
-}
-
-void ThrottlingURLLoader::ResumeReadingBodyFromNet() {
- if (url_loader_) {
- url_loader_->ResumeReadingBodyFromNet();
- }
-}
-
void ThrottlingURLLoader::InterceptResponse(
mojo::PendingRemote<network::mojom::URLLoader> new_loader,
mojo::PendingReceiver<network::mojom::URLLoaderClient> new_client_receiver,
@@ -989,7 +977,6 @@
body->swap(body_);
if (original_loader) {
- url_loader_->ResumeReadingBodyFromNet();
*original_loader = url_loader_.Unbind();
}
url_loader_.Bind(std::move(new_loader));
diff --git a/third_party/blink/common/loader/throttling_url_loader_unittest.cc b/third_party/blink/common/loader/throttling_url_loader_unittest.cc
index a01c94b..f2774a7 100644
--- a/third_party/blink/common/loader/throttling_url_loader_unittest.cc
+++ b/third_party/blink/common/loader/throttling_url_loader_unittest.cc
@@ -141,9 +141,6 @@
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
-
size_t create_loader_and_start_called_ = 0;
std::vector<std::string> headers_removed_on_redirect_;
net::HttpRequestHeaders headers_modified_on_redirect_;
diff --git a/third_party/blink/public/common/loader/mime_sniffing_url_loader.h b/third_party/blink/public/common/loader/mime_sniffing_url_loader.h
index 2e584ef1..a8c9c7e 100644
--- a/third_party/blink/public/common/loader/mime_sniffing_url_loader.h
+++ b/third_party/blink/public/common/loader/mime_sniffing_url_loader.h
@@ -110,8 +110,6 @@
const std::optional<GURL>& new_url) override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
- void PauseReadingBodyFromNet() override;
- void ResumeReadingBodyFromNet() override;
void OnBodyReadable(MojoResult);
void OnBodyWritable(MojoResult);
diff --git a/third_party/blink/public/common/loader/throttling_url_loader.h b/third_party/blink/public/common/loader/throttling_url_loader.h
index dca20d2a..d8541150 100644
--- a/third_party/blink/public/common/loader/throttling_url_loader.h
+++ b/third_party/blink/public/common/loader/throttling_url_loader.h
@@ -142,8 +142,6 @@
const net::HttpRequestHeaders& modified_headers,
const net::HttpRequestHeaders& modified_cors_exempt_headers);
void SetPriority(net::RequestPriority priority, int32_t intra_priority_value);
- void PauseReadingBodyFromNet();
- void ResumeReadingBodyFromNet();
// Restarts the load immediately with |factory| and |url_loader_options|.
// It must only be called when the following conditions are met:
diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc b/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
index 866bc74..8796ed1f 100644
--- a/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
+++ b/third_party/blink/renderer/platform/loader/child_url_loader_factory_bundle.cc
@@ -63,14 +63,6 @@
loader_sink_->SetPriority(priority, intra_priority_value);
}
- void PauseReadingBodyFromNet() override {
- loader_sink_->PauseReadingBodyFromNet();
- }
-
- void ResumeReadingBodyFromNet() override {
- loader_sink_->ResumeReadingBodyFromNet();
- }
-
// network::mojom::URLLoaderClient implementation:
void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr early_hints) override {
client_sink_->OnReceiveEarlyHints(std::move(early_hints));
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/background_url_loader_unittest.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/background_url_loader_unittest.cc
index c11e892..98c040c 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/background_url_loader_unittest.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/background_url_loader_unittest.cc
@@ -421,8 +421,6 @@
set_priority_log_.push_back(PriorityInfo{
.priority = priority, .intra_priority_value = intra_priority_value});
}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
bool follow_redirect_called() const { return follow_redirect_called_; }
const std::vector<PriorityInfo>& set_priority_log() const {
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender_unittest.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender_unittest.cc
index 65ba583c..e7578fc 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender_unittest.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender_unittest.cc
@@ -245,8 +245,6 @@
}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
void SetFollowRedirectCallback(RepeatingFollowRedirectCallback callback) {
follow_redirect_callback_ = std::move(callback);
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader_unittest.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader_unittest.cc
index 716d8632..2033bf3 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader_unittest.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader_unittest.cc
@@ -100,8 +100,6 @@
const std::optional<GURL>&) override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
- void PauseReadingBodyFromNet() override {}
- void ResumeReadingBodyFromNet() override {}
private:
mojo::Receiver<network::mojom::URLLoader> receiver_;
