Remove now unused kURLLoadOptionPauseOnResponseStarted.
Bug: 934009, 791049
Change-Id: Id0fcc731e78511f3b8f54105b4fbfec5ccd8a06e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1727029
Reviewed-by: Clark DuVall <cduvall@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682413}
diff --git a/android_webview/browser/network_service/android_stream_reader_url_loader.cc b/android_webview/browser/network_service/android_stream_reader_url_loader.cc
index bb4595b2..56fdfe6 100644
--- a/android_webview/browser/network_service/android_stream_reader_url_loader.cc
+++ b/android_webview/browser/network_service/android_stream_reader_url_loader.cc
@@ -116,7 +116,6 @@
const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) {}
-void AndroidStreamReaderURLLoader::ProceedWithResponse() {}
void AndroidStreamReaderURLLoader::SetPriority(net::RequestPriority priority,
int intra_priority_value) {}
void AndroidStreamReaderURLLoader::PauseReadingBodyFromNet() {}
diff --git a/android_webview/browser/network_service/android_stream_reader_url_loader.h b/android_webview/browser/network_service/android_stream_reader_url_loader.h
index 285a921b..7796315 100644
--- a/android_webview/browser/network_service/android_stream_reader_url_loader.h
+++ b/android_webview/browser/network_service/android_stream_reader_url_loader.h
@@ -70,7 +70,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
void PauseReadingBodyFromNet() override;
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 1208e87..ce4de09d 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
@@ -75,7 +75,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
@@ -588,11 +587,6 @@
Restart();
}
-void InterceptedRequest::ProceedWithResponse() {
- if (target_loader_)
- target_loader_->ProceedWithResponse();
-}
-
void InterceptedRequest::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (target_loader_)
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_loader_factory.cc b/chrome/browser/chromeos/fileapi/external_file_url_loader_factory.cc
index f03c16c..30b6967 100644
--- a/chrome/browser/chromeos/fileapi/external_file_url_loader_factory.cc
+++ b/chrome/browser/chromeos/fileapi/external_file_url_loader_factory.cc
@@ -211,7 +211,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
index 2ecc9e3e..4a62cd53 100644
--- a/chrome/browser/extensions/chrome_url_request_util.cc
+++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -122,7 +122,6 @@
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
void ResumeReadingBodyFromNet() override {}
- void ProceedWithResponse() override {}
private:
ResourceBundleFileLoader(const std::string& content_security_policy,
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
index d1241af..6fc5241 100644
--- a/chrome/browser/net/dns_probe_browsertest.cc
+++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -186,7 +186,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.cc b/chrome/browser/offline_pages/offline_page_url_loader.cc
index 029bcb010..cd315e8 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader.cc
+++ b/chrome/browser/offline_pages/offline_page_url_loader.cc
@@ -120,10 +120,6 @@
NOTREACHED();
}
-void OfflinePageURLLoader::ProceedWithResponse() {
- NOTREACHED();
-}
-
void OfflinePageURLLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
// Ignore: this class doesn't have a concept of priority.
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.h b/chrome/browser/offline_pages/offline_page_url_loader.h
index 4fd73a6..4214893 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader.h
+++ b/chrome/browser/offline_pages/offline_page_url_loader.h
@@ -59,7 +59,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/chrome/browser/previews/previews_lite_page_redirect_url_loader.cc b/chrome/browser/previews/previews_lite_page_redirect_url_loader.cc
index b6fc3e9..a48e85fce 100644
--- a/chrome/browser/previews/previews_lite_page_redirect_url_loader.cc
+++ b/chrome/browser/previews/previews_lite_page_redirect_url_loader.cc
@@ -197,12 +197,6 @@
NOTREACHED();
}
-void PreviewsLitePageRedirectURLLoader::ProceedWithResponse() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- // This class never provides a response past the headers.
- NOTREACHED();
-}
-
void PreviewsLitePageRedirectURLLoader::SetPriority(
net::RequestPriority priority,
int32_t intra_priority_value) {
diff --git a/chrome/browser/previews/previews_lite_page_redirect_url_loader.h b/chrome/browser/previews/previews_lite_page_redirect_url_loader.h
index 0b63ac9..1c69b4ba 100644
--- a/chrome/browser/previews/previews_lite_page_redirect_url_loader.h
+++ b/chrome/browser/previews/previews_lite_page_redirect_url_loader.h
@@ -53,7 +53,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/chrome/browser/previews/previews_lite_page_serving_url_loader.cc b/chrome/browser/previews/previews_lite_page_serving_url_loader.cc
index f3b3013..36fd50c 100644
--- a/chrome/browser/previews/previews_lite_page_serving_url_loader.cc
+++ b/chrome/browser/previews/previews_lite_page_serving_url_loader.cc
@@ -413,12 +413,6 @@
NOTREACHED();
}
-void PreviewsLitePageServingURLLoader::ProceedWithResponse() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- // Pass through.
- network_url_loader_->ProceedWithResponse();
-}
-
void PreviewsLitePageServingURLLoader::SetPriority(
net::RequestPriority priority,
int32_t intra_priority_value) {
diff --git a/chrome/browser/previews/previews_lite_page_serving_url_loader.h b/chrome/browser/previews/previews_lite_page_serving_url_loader.h
index 4e22826..95a6152 100644
--- a/chrome/browser/previews/previews_lite_page_serving_url_loader.h
+++ b/chrome/browser/previews/previews_lite_page_serving_url_loader.h
@@ -67,7 +67,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
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 907b8c6..c9f4f5ca 100644
--- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
+++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
@@ -108,8 +108,6 @@
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override { target_loader_->ProceedWithResponse(); }
-
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {
target_loader_->SetPriority(priority, intra_priority_value);
diff --git a/chromecast/browser/cast_extension_url_loader_factory.cc b/chromecast/browser/cast_extension_url_loader_factory.cc
index 462d036..14239a4 100644
--- a/chromecast/browser/cast_extension_url_loader_factory.cc
+++ b/chromecast/browser/cast_extension_url_loader_factory.cc
@@ -94,10 +94,6 @@
<< "The original client shouldn't have been notified of any redirects";
}
- void ProceedWithResponse() override {
- network_loader_->ProceedWithResponse();
- }
-
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {
network_loader_->SetPriority(priority, intra_priority_value);
diff --git a/content/browser/android/content_url_loader_factory.cc b/content/browser/android/content_url_loader_factory.cc
index 2e4227b7..26dd7ef 100644
--- a/content/browser/android/content_url_loader_factory.cc
+++ b/content/browser/android/content_url_loader_factory.cc
@@ -105,7 +105,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/content/browser/appcache/appcache_subresource_url_factory.cc b/content/browser/appcache/appcache_subresource_url_factory.cc
index b305ce0a..ad1eaa1 100644
--- a/content/browser/appcache/appcache_subresource_url_factory.cc
+++ b/content/browser/appcache/appcache_subresource_url_factory.cc
@@ -158,8 +158,6 @@
}
// network::mojom::URLLoader implementation
- void ProceedWithResponse() override { NOTREACHED(); }
-
void ContinueFollowRedirect(
SingleRequestURLLoaderFactory::RequestHandler handler) {
if (handler) {
diff --git a/content/browser/appcache/appcache_url_loader_job.cc b/content/browser/appcache/appcache_url_loader_job.cc
index 03c23a09..946530b 100644
--- a/content/browser/appcache/appcache_url_loader_job.cc
+++ b/content/browser/appcache/appcache_url_loader_job.cc
@@ -116,12 +116,6 @@
NOTREACHED() << "appcache never produces redirects";
}
-void AppCacheURLLoaderJob::ProceedWithResponse() {
- // TODO(arthursonzogni): Implement this if AppCache starts using the
- // AppCacheURLLoader before the Network Service has shipped.
- NOTREACHED();
-}
-
void AppCacheURLLoaderJob::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {}
void AppCacheURLLoaderJob::PauseReadingBodyFromNet() {}
diff --git a/content/browser/appcache/appcache_url_loader_job.h b/content/browser/appcache/appcache_url_loader_job.h
index 1e2d3a21..575936f6 100644
--- a/content/browser/appcache/appcache_url_loader_job.h
+++ b/content/browser/appcache/appcache_url_loader_job.h
@@ -68,7 +68,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/browser/devtools/devtools_url_loader_interceptor.cc b/content/browser/devtools/devtools_url_loader_interceptor.cc
index bb5588d..79df0a3 100644
--- a/content/browser/devtools/devtools_url_loader_interceptor.cc
+++ b/content/browser/devtools/devtools_url_loader_interceptor.cc
@@ -263,7 +263,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
@@ -1294,10 +1293,6 @@
StartRequest();
}
-void InterceptionJob::ProceedWithResponse() {
- NOTREACHED();
-}
-
void InterceptionJob::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
priority_ = std::make_pair(priority, intra_priority_value);
diff --git a/content/browser/file_url_loader_factory.cc b/content/browser/file_url_loader_factory.cc
index 032692b..9b6e46d 100644
--- a/content/browser/file_url_loader_factory.cc
+++ b/content/browser/file_url_loader_factory.cc
@@ -178,7 +178,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override { NOTREACHED(); }
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
@@ -410,7 +409,6 @@
}
MaybeDeleteSelf();
}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/content/browser/fileapi/file_system_url_loader_factory.cc b/content/browser/fileapi/file_system_url_loader_factory.cc
index c6537709..db8f7bca 100644
--- a/content/browser/fileapi/file_system_url_loader_factory.cc
+++ b/content/browser/fileapi/file_system_url_loader_factory.cc
@@ -102,7 +102,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 48d5dca9..512c3d9 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1915,22 +1915,6 @@
// destroyed the NavigationRequest.
return;
}
-
- // Call ProceedWithResponse()
- // Note: There is no need to call ProceedWithResponse() when the Network
- // Service is enabled. See https://crbug.com/791049.
- if (!base::FeatureList::IsEnabled(network::features::kNetworkService)) {
- // |url_loader_client_endpoints_| is always valid, except in some tests
- // where the TestNavigationLoader is used.
- if (url_loader_client_endpoints_) {
- network::mojom::URLLoaderPtr url_loader(
- std::move(url_loader_client_endpoints_->url_loader));
- url_loader->ProceedWithResponse();
- url_loader_client_endpoints_->url_loader = url_loader.PassInterface();
- } else {
- loader_->ProceedWithResponse();
- }
- }
}
// Abort the request if needed. This includes requests that were blocked by
diff --git a/content/browser/loader/navigation_url_loader.h b/content/browser/loader/navigation_url_loader.h
index 7123394..ecb3e470 100644
--- a/content/browser/loader/navigation_url_loader.h
+++ b/content/browser/loader/navigation_url_loader.h
@@ -73,9 +73,6 @@
const net::HttpRequestHeaders& modified_headers,
PreviewsState new_previews_state) = 0;
- // Called in response to OnResponseStarted to process the response.
- virtual void ProceedWithResponse() = 0;
-
protected:
NavigationURLLoader() {}
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
index 966d686..e15b6f0 100644
--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -1558,8 +1558,6 @@
base::Time::Now()));
}
-void NavigationURLLoaderImpl::ProceedWithResponse() {}
-
void NavigationURLLoaderImpl::OnReceiveResponse(
scoped_refptr<network::ResourceResponse> response_head,
network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints,
diff --git a/content/browser/loader/navigation_url_loader_impl.h b/content/browser/loader/navigation_url_loader_impl.h
index 83683e2..53bd288f 100644
--- a/content/browser/loader/navigation_url_loader_impl.h
+++ b/content/browser/loader/navigation_url_loader_impl.h
@@ -54,7 +54,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
PreviewsState new_previews_state) override;
- void ProceedWithResponse() override;
void OnReceiveResponse(
scoped_refptr<network::ResourceResponse> response_head,
diff --git a/content/browser/loader/prefetch_url_loader.cc b/content/browser/loader/prefetch_url_loader.cc
index 1346aa7..41e22fb 100644
--- a/content/browser/loader/prefetch_url_loader.cc
+++ b/content/browser/loader/prefetch_url_loader.cc
@@ -117,11 +117,6 @@
base::nullopt);
}
-void PrefetchURLLoader::ProceedWithResponse() {
- if (loader_)
- loader_->ProceedWithResponse();
-}
-
void PrefetchURLLoader::SetPriority(net::RequestPriority priority,
int intra_priority_value) {
if (loader_)
diff --git a/content/browser/loader/prefetch_url_loader.h b/content/browser/loader/prefetch_url_loader.h
index 0541dd0..809d129 100644
--- a/content/browser/loader/prefetch_url_loader.h
+++ b/content/browser/loader/prefetch_url_loader.h
@@ -94,7 +94,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
void PauseReadingBodyFromNet() override;
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 16232a7..075337cd 100644
--- a/content/browser/service_worker/service_worker_installed_script_loader.cc
+++ b/content/browser/service_worker/service_worker_installed_script_loader.cc
@@ -128,11 +128,6 @@
NOTREACHED();
}
-void ServiceWorkerInstalledScriptLoader::ProceedWithResponse() {
- // This function should only be called for navigations.
- NOTREACHED();
-}
-
void ServiceWorkerInstalledScriptLoader::SetPriority(
net::RequestPriority priority,
int32_t intra_priority_value) {
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 a23cadd..62145d7 100644
--- a/content/browser/service_worker/service_worker_installed_script_loader.h
+++ b/content/browser/service_worker/service_worker_installed_script_loader.h
@@ -57,7 +57,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/browser/service_worker/service_worker_navigation_loader.cc b/content/browser/service_worker/service_worker_navigation_loader.cc
index 1b1fa14..4b447c9 100644
--- a/content/browser/service_worker/service_worker_navigation_loader.cc
+++ b/content/browser/service_worker/service_worker_navigation_loader.cc
@@ -417,12 +417,6 @@
NOTIMPLEMENTED();
}
-void ServiceWorkerNavigationLoader::ProceedWithResponse() {
- // ServiceWorkerNavigationLoader doesn't need to wait for
- // ProceedWithResponse() since it doesn't use MojoAsyncResourceHandler to load
- // the resource request.
-}
-
void ServiceWorkerNavigationLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
NOTIMPLEMENTED();
diff --git a/content/browser/service_worker/service_worker_navigation_loader.h b/content/browser/service_worker/service_worker_navigation_loader.h
index 674e6f1..a211038 100644
--- a/content/browser/service_worker/service_worker_navigation_loader.h
+++ b/content/browser/service_worker/service_worker_navigation_loader.h
@@ -134,7 +134,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
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 21f662b..74c6dac 100644
--- a/content/browser/service_worker/service_worker_new_script_loader.cc
+++ b/content/browser/service_worker/service_worker_new_script_loader.cc
@@ -257,10 +257,6 @@
NOTREACHED();
}
-void ServiceWorkerNewScriptLoader::ProceedWithResponse() {
- NOTREACHED();
-}
-
void ServiceWorkerNewScriptLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (network_loader_)
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 79f7a180..05dace4 100644
--- a/content/browser/service_worker/service_worker_new_script_loader.h
+++ b/content/browser/service_worker/service_worker_new_script_loader.h
@@ -134,7 +134,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/browser/web_package/prefetched_signed_exchange_cache.cc b/content/browser/web_package/prefetched_signed_exchange_cache.cc
index 3486a587..d4d0d65 100644
--- a/content/browser/web_package/prefetched_signed_exchange_cache.cc
+++ b/content/browser/web_package/prefetched_signed_exchange_cache.cc
@@ -105,7 +105,6 @@
const base::Optional<GURL>& new_url) override {
NOTREACHED();
}
- void ProceedWithResponse() override { NOTREACHED(); }
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override {
// There is nothing to do, because this class just calls OnReceiveRedirect.
@@ -146,17 +145,7 @@
response_.encoded_data_length = 0;
if (is_navigation_request) {
client_->OnReceiveResponse(response_);
- // There are two situations we need to call SendResponseBody() in advance:
- //
- // 1. When Network Service is enabled, ProceedWithResponse() will not be
- // called. See https://crbug.com/791049.
- //
- // 2. When NavigationImmediateResponseBody is enabled, see
- // https://crbug.com/831155.
- if (base::FeatureList::IsEnabled(network::features::kNetworkService) ||
- IsNavigationImmediateResponseBodyEnabled()) {
- SendResponseBody();
- }
+ SendResponseBody();
return;
}
@@ -243,14 +232,7 @@
const base::Optional<GURL>& new_url) override {
NOTREACHED();
}
- void ProceedWithResponse() override {
- DCHECK(!base::FeatureList::IsEnabled(network::features::kNetworkService));
- // If NavigationImmediateResponseBody is enabled, SendResponseBody() has
- // already been called in the constructor.
- if (!IsNavigationImmediateResponseBodyEnabled())
- SendResponseBody();
- }
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override {
// There is nothing to do, because there is no prioritization mechanism for
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 5f8025e..7687fd3 100644
--- a/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
+++ b/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
@@ -86,7 +86,6 @@
void(const std::vector<std::string>&,
const net::HttpRequestHeaders&,
const base::Optional<GURL>&));
- MOCK_METHOD0(ProceedWithResponse, void());
MOCK_METHOD2(SetPriority,
void(net::RequestPriority priority,
int32_t intra_priority_value));
diff --git a/content/browser/web_package/signed_exchange_loader.cc b/content/browser/web_package/signed_exchange_loader.cc
index 61601df..5e7b361 100644
--- a/content/browser/web_package/signed_exchange_loader.cc
+++ b/content/browser/web_package/signed_exchange_loader.cc
@@ -102,24 +102,6 @@
if (outer_response_body)
OnStartLoadingResponseBody(std::move(outer_response_body));
- // TODO(https://crbug.com/791049): Remove this when NetworkService is
- // enabled by default.
- if (url_loader_options_ &
- network::mojom::kURLLoadOptionPauseOnResponseStarted) {
- // We don't propagate the response to the navigation request and its
- // throttles, therefore we need to call this here internally in order to
- // move it forward.
- //
- // ProceedWithResponse() is used when the network service is disabled to
- // prevent the InterceptingResourceHandler (used for download) from
- // intercepting the load before the NavigationRequest allowed it.
- // See https://crbug.com/791049.
- //
- // Special care has been taken not to resume the InterceptingResourceHandler
- // by mistake in https://crbug.com/896659.
- url_loader_->ProceedWithResponse();
- }
-
// Bind the endpoint with |this| to get the body DataPipe.
url_loader_client_binding_.Bind(std::move(endpoints->url_loader_client));
@@ -207,13 +189,6 @@
NOTREACHED();
}
-void SignedExchangeLoader::ProceedWithResponse() {
- DCHECK(!base::FeatureList::IsEnabled(network::features::kNetworkService));
- DCHECK(url_loader_options_ &
- network::mojom::kURLLoadOptionPauseOnResponseStarted);
- // ProceedWithResponse() has already been called in the constructor.
-}
-
void SignedExchangeLoader::SetPriority(net::RequestPriority priority,
int intra_priority_value) {
url_loader_->SetPriority(priority, intra_priority_value);
diff --git a/content/browser/web_package/signed_exchange_loader.h b/content/browser/web_package/signed_exchange_loader.h
index 56a070e..68580d87 100644
--- a/content/browser/web_package/signed_exchange_loader.h
+++ b/content/browser/web_package/signed_exchange_loader.h
@@ -97,7 +97,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/browser/web_package/signed_exchange_loader_unittest.cc b/content/browser/web_package/signed_exchange_loader_unittest.cc
index 7154970..f8ff0c0 100644
--- a/content/browser/web_package/signed_exchange_loader_unittest.cc
+++ b/content/browser/web_package/signed_exchange_loader_unittest.cc
@@ -85,7 +85,6 @@
void(const std::vector<std::string>&,
const net::HttpRequestHeaders&,
const base::Optional<GURL>&));
- MOCK_METHOD0(ProceedWithResponse, void());
MOCK_METHOD2(SetPriority,
void(net::RequestPriority priority,
int32_t intra_priority_value));
diff --git a/content/browser/worker_host/worker_script_loader.cc b/content/browser/worker_host/worker_script_loader.cc
index 2269b2fb..d1e8465 100644
--- a/content/browser/worker_host/worker_script_loader.cc
+++ b/content/browser/worker_host/worker_script_loader.cc
@@ -233,11 +233,6 @@
Start();
}
-void WorkerScriptLoader::ProceedWithResponse() {
- // Only for navigations.
- NOTREACHED();
-}
-
// Below we make a small effort to support the other URLLoader functions by
// forwarding to the current |url_loader_| if any, but don't bother queuing
// state or propagating state to a new URLLoader upon redirect.
diff --git a/content/browser/worker_host/worker_script_loader.h b/content/browser/worker_host/worker_script_loader.h
index 5328ef2..a39d326 100644
--- a/content/browser/worker_host/worker_script_loader.h
+++ b/content/browser/worker_host/worker_script_loader.h
@@ -83,7 +83,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/common/mime_sniffing_url_loader.cc b/content/common/mime_sniffing_url_loader.cc
index 0a92ed2..2f3dea9 100644
--- a/content/common/mime_sniffing_url_loader.cc
+++ b/content/common/mime_sniffing_url_loader.cc
@@ -151,12 +151,6 @@
NOTREACHED();
}
-void MimeSniffingURLLoader::ProceedWithResponse() {
- if (state_ == State::kAborted)
- return;
- source_url_loader_->ProceedWithResponse();
-}
-
void MimeSniffingURLLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (state_ == State::kAborted)
diff --git a/content/common/mime_sniffing_url_loader.h b/content/common/mime_sniffing_url_loader.h
index fdea9ec0..b3687c9 100644
--- a/content/common/mime_sniffing_url_loader.h
+++ b/content/common/mime_sniffing_url_loader.h
@@ -98,7 +98,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/common/throttling_url_loader_unittest.cc b/content/common/throttling_url_loader_unittest.cc
index 4b0a9c8..3135ba8 100644
--- a/content/common/throttling_url_loader_unittest.cc
+++ b/content/common/throttling_url_loader_unittest.cc
@@ -123,8 +123,6 @@
headers_modified_on_redirect_ = modified_headers;
}
- void ProceedWithResponse() override {}
-
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
diff --git a/content/renderer/loader/child_url_loader_factory_bundle.cc b/content/renderer/loader/child_url_loader_factory_bundle.cc
index e2cc1ad..03f53de 100644
--- a/content/renderer/loader/child_url_loader_factory_bundle.cc
+++ b/content/renderer/loader/child_url_loader_factory_bundle.cc
@@ -44,8 +44,6 @@
base::nullopt /* new_url */);
}
- void ProceedWithResponse() override { loader_sink_->ProceedWithResponse(); }
-
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {
loader_sink_->SetPriority(priority, intra_priority_value);
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.cc b/content/renderer/service_worker/service_worker_subresource_loader.cc
index 17bf4a2..b6a8215 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader.cc
+++ b/content/renderer/service_worker/service_worker_subresource_loader.cc
@@ -683,10 +683,6 @@
StartRequest(resource_request_);
}
-void ServiceWorkerSubresourceLoader::ProceedWithResponse() {
- NOTREACHED();
-}
-
void ServiceWorkerSubresourceLoader::SetPriority(net::RequestPriority priority,
int intra_priority_value) {
// Not supported (do nothing).
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.h b/content/renderer/service_worker/service_worker_subresource_loader.h
index 52474e0e..4d6adef 100644
--- a/content/renderer/service_worker/service_worker_subresource_loader.h
+++ b/content/renderer/service_worker/service_worker_subresource_loader.h
@@ -108,7 +108,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/content/test/test_navigation_url_loader.cc b/content/test/test_navigation_url_loader.cc
index 9e80f1a..1b6bae7d 100644
--- a/content/test/test_navigation_url_loader.cc
+++ b/content/test/test_navigation_url_loader.cc
@@ -25,9 +25,7 @@
NavigationURLLoaderDelegate* delegate)
: request_info_(std::move(request_info)),
delegate_(delegate),
- redirect_count_(0),
- response_proceeded_(false) {
-}
+ redirect_count_(0) {}
void TestNavigationURLLoader::FollowRedirect(
const std::vector<std::string>& removed_headers,
@@ -36,10 +34,6 @@
redirect_count_++;
}
-void TestNavigationURLLoader::ProceedWithResponse() {
- response_proceeded_ = true;
-}
-
void TestNavigationURLLoader::SimulateServerRedirect(const GURL& redirect_url) {
net::RedirectInfo redirect_info;
redirect_info.status_code = 302;
diff --git a/content/test/test_navigation_url_loader.h b/content/test/test_navigation_url_loader.h
index fbd0810..b4f50741 100644
--- a/content/test/test_navigation_url_loader.h
+++ b/content/test/test_navigation_url_loader.h
@@ -37,7 +37,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
PreviewsState new_previews_state) override;
- void ProceedWithResponse() override;
NavigationRequestInfo* request_info() const { return request_info_.get(); }
@@ -55,15 +54,12 @@
int redirect_count() { return redirect_count_; }
- bool response_proceeded() { return response_proceeded_; }
-
private:
~TestNavigationURLLoader() override;
std::unique_ptr<NavigationRequestInfo> request_info_;
NavigationURLLoaderDelegate* delegate_;
int redirect_count_;
- bool response_proceeded_;
};
} // namespace content
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 95d47c3..644d52c 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
@@ -232,12 +232,6 @@
RestartInternal();
}
-void WebRequestProxyingURLLoaderFactory::InProgressRequest::
- ProceedWithResponse() {
- if (target_loader_.is_bound())
- target_loader_->ProceedWithResponse();
-}
-
void WebRequestProxyingURLLoaderFactory::InProgressRequest::SetPriority(
net::RequestPriority priority,
int32_t intra_priority_value) {
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 83352e0b..0d8f0731 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
@@ -61,7 +61,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/headless/test/test_network_interceptor.cc b/headless/test/test_network_interceptor.cc
index 0d60a0de..213deaf806 100644
--- a/headless/test/test_network_interceptor.cc
+++ b/headless/test/test_network_interceptor.cc
@@ -40,7 +40,6 @@
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override { DCHECK(false); }
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc
index befe48b..ae313f5 100644
--- a/services/network/cors/cors_url_loader.cc
+++ b/services/network/cors/cors_url_loader.cc
@@ -223,10 +223,6 @@
network_loader_->FollowRedirect(removed_headers, modified_headers, new_url);
}
-void CorsURLLoader::ProceedWithResponse() {
- NOTREACHED();
-}
-
void CorsURLLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (network_loader_)
diff --git a/services/network/cors/cors_url_loader.h b/services/network/cors/cors_url_loader.h
index 535b7fa3..816a6f1 100644
--- a/services/network/cors/cors_url_loader.h
+++ b/services/network/cors/cors_url_loader.h
@@ -60,7 +60,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/services/network/public/cpp/simple_url_loader_unittest.cc b/services/network/public/cpp/simple_url_loader_unittest.cc
index 64494c3b..a1d008a 100644
--- a/services/network/public/cpp/simple_url_loader_unittest.cc
+++ b/services/network/public/cpp/simple_url_loader_unittest.cc
@@ -1910,7 +1910,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override {}
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {
NOTREACHED();
diff --git a/services/network/public/mojom/url_loader.mojom b/services/network/public/mojom/url_loader.mojom
index 03e054e..d47cfe2 100644
--- a/services/network/public/mojom/url_loader.mojom
+++ b/services/network/public/mojom/url_loader.mojom
@@ -423,14 +423,6 @@
network.mojom.HttpRequestHeaders modified_headers,
url.mojom.Url? new_url);
- // Resumes loading the response body if the URLLoader paused the request upon
- // receiving the final response headers.
- // The URLLoader pauses the request when kURLLoadOptionPauseOnResponseStarted
- // is used.
- // TODO(arthursonzogni): This is a temporary feature. Remove this as soon as
- // the InterceptingResourceHandler is removed. See https://crbug.com/791049.
- ProceedWithResponse();
-
// Sets the request priority.
// |intra_priority_value| is a lesser priority which is used to prioritize
// requests within a given priority level. If -1 is passed, the existing
diff --git a/services/network/public/mojom/url_loader_factory.mojom b/services/network/public/mojom/url_loader_factory.mojom
index 4f36d942..19db323 100644
--- a/services/network/public/mojom/url_loader_factory.mojom
+++ b/services/network/public/mojom/url_loader_factory.mojom
@@ -17,18 +17,13 @@
// Sends the net::SSLInfo struct in OnComplete when the connection had a major
// certificate error.
const uint32 kURLLoadOptionSendSSLInfoForCertificateError = 8;
-// Pause the request upon receiving the final response header. The request can
-// be resumed by using URLLoader::ProceedWithResponse.
-// TODO(arthursonzogni): This is a temporary feature. Remove this as soon as
-// the InterceptingResourceHandler is removed. See https://crbug.com/791049.
-const uint32 kURLLoadOptionPauseOnResponseStarted = 16;
// Uses the header client set in URLLoaderFactoryParams for this request.
-const uint32 kURLLoadOptionUseHeaderClient = 32;
+const uint32 kURLLoadOptionUseHeaderClient = 16;
// Disallow the request from sending cookies. Disallow the response from writing
// cookies.
-const uint32 kURLLoadOptionBlockAllCookies = 64;
+const uint32 kURLLoadOptionBlockAllCookies = 32;
// Similar to |kURLLoadOptionBlockAllCookies|, but only for third party cookies.
-const uint32 kURLLoadOptionBlockThirdPartyCookies = 128;
+const uint32 kURLLoadOptionBlockThirdPartyCookies = 64;
interface URLLoaderFactory {
// Creates a URLLoader and starts loading with the given |request|. |client|'s
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 8fd2f07..d066761f 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -729,10 +729,6 @@
new_redirect_url_.reset();
}
-void URLLoader::ProceedWithResponse() {
- NOTREACHED();
-}
-
void URLLoader::SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) {
if (url_request_ && resource_scheduler_client_) {
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
index 9e54588..394e3300 100644
--- a/services/network/url_loader.h
+++ b/services/network/url_loader.h
@@ -81,7 +81,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override;
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override;
void PauseReadingBodyFromNet() override;
diff --git a/storage/browser/blob/blob_url_loader.h b/storage/browser/blob/blob_url_loader.h
index 7c528d7..8e9474f 100644
--- a/storage/browser/blob/blob_url_loader.h
+++ b/storage/browser/blob/blob_url_loader.h
@@ -43,7 +43,6 @@
void FollowRedirect(const std::vector<std::string>& removed_headers,
const net::HttpRequestHeaders& modified_request_headers,
const base::Optional<GURL>& new_url) override;
- void ProceedWithResponse() override {}
void SetPriority(net::RequestPriority priority,
int32_t intra_priority_value) override {}
void PauseReadingBodyFromNet() override {}
