Remove ResourceContext argument from MaybeCreateLoader
This is no longer used now that NavigationLoaderOnUI is default.
Bug: 824840
Change-Id: I364ff25df3d32ba2b4e0265f8231619460b72b2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1747985
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686213}
diff --git a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc
index f9d8860..bbb8e1eb 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc
+++ b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc
@@ -23,7 +23,6 @@
void OfflinePageURLLoaderRequestInterceptor::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
content::BrowserContext* browser_context,
- content::ResourceContext* resource_context,
content::URLLoaderRequestInterceptor::LoaderCallback callback) {
url_loader_ = OfflinePageURLLoader::Create(
navigation_ui_data_, frame_tree_node_id_, tentative_resource_request,
diff --git a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
index 1651d0d..1f7e53b3 100644
--- a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
+++ b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h
@@ -26,7 +26,6 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
content::BrowserContext* browser_context,
- content::ResourceContext* resource_context,
content::URLLoaderRequestInterceptor::LoaderCallback callback) override;
private:
diff --git a/chrome/browser/previews/previews_lite_page_url_loader_interceptor.cc b/chrome/browser/previews/previews_lite_page_url_loader_interceptor.cc
index b0d96bd..0bb61cb 100644
--- a/chrome/browser/previews/previews_lite_page_url_loader_interceptor.cc
+++ b/chrome/browser/previews/previews_lite_page_url_loader_interceptor.cc
@@ -92,7 +92,6 @@
void PreviewsLitePageURLLoaderInterceptor::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
content::BrowserContext* browser_context,
- content::ResourceContext* resource_context,
content::URLLoaderRequestInterceptor::LoaderCallback callback) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/chrome/browser/previews/previews_lite_page_url_loader_interceptor.h b/chrome/browser/previews/previews_lite_page_url_loader_interceptor.h
index 3cdc989..bb5ecfd 100644
--- a/chrome/browser/previews/previews_lite_page_url_loader_interceptor.h
+++ b/chrome/browser/previews/previews_lite_page_url_loader_interceptor.h
@@ -37,7 +37,6 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
content::BrowserContext* browser_context,
- content::ResourceContext* resource_context,
content::URLLoaderRequestInterceptor::LoaderCallback callback) override;
private:
diff --git a/chrome/browser/previews/previews_lite_page_url_loader_interceptor_unittest.cc b/chrome/browser/previews/previews_lite_page_url_loader_interceptor_unittest.cc
index c8c636b..727062d 100644
--- a/chrome/browser/previews/previews_lite_page_url_loader_interceptor_unittest.cc
+++ b/chrome/browser/previews/previews_lite_page_url_loader_interceptor_unittest.cc
@@ -103,7 +103,7 @@
// Check that we don't trigger when previews are not allowed.
request.previews_state = content::PREVIEWS_OFF;
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
@@ -122,7 +122,7 @@
// Check that we trigger when previews are allowed.
request.previews_state = content::LITE_PAGE_REDIRECT_ON;
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
@@ -150,7 +150,7 @@
net::URLRequestStatus::SUCCESS);
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
@@ -175,7 +175,7 @@
net::URLRequestStatus::SUCCESS);
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
@@ -200,7 +200,7 @@
"Fake Body", net::HTTP_FORBIDDEN, net::URLRequestStatus::SUCCESS);
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
@@ -224,7 +224,7 @@
"Fake Body", net::HTTP_OK, net::URLRequestStatus::FAILED);
interceptor().MaybeCreateLoader(
- request, nullptr, nullptr,
+ request, nullptr,
base::BindOnce(&PreviewsLitePageURLLoaderInterceptorTest::HandlerCallback,
base::Unretained(this)));
diff --git a/content/browser/appcache/appcache_request_handler.cc b/content/browser/appcache/appcache_request_handler.cc
index a4eb84d..5667fdc0 100644
--- a/content/browser/appcache/appcache_request_handler.cc
+++ b/content/browser/appcache/appcache_request_handler.cc
@@ -517,7 +517,6 @@
void AppCacheRequestHandler::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) {
loader_callback_ =
@@ -605,8 +604,8 @@
// Subresource loads start out just like a main resource loads, but they go
// down different branches along the way to completion.
- MaybeCreateLoader(resource_request, nullptr, nullptr,
- std::move(loader_callback), std::move(fallback_callback));
+ MaybeCreateLoader(resource_request, nullptr, std::move(loader_callback),
+ std::move(fallback_callback));
}
void AppCacheRequestHandler::MaybeFallbackForSubresourceResponse(
diff --git a/content/browser/appcache/appcache_request_handler.h b/content/browser/appcache/appcache_request_handler.h
index 357bcd4..312645da 100644
--- a/content/browser/appcache/appcache_request_handler.h
+++ b/content/browser/appcache/appcache_request_handler.h
@@ -76,7 +76,6 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override;
// MaybeCreateLoaderForResponse always returns synchronously.
diff --git a/content/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc
index ee7bb21..f2477d9 100644
--- a/content/browser/appcache/appcache_storage_impl_unittest.cc
+++ b/content/browser/appcache/appcache_storage_impl_unittest.cc
@@ -1662,7 +1662,7 @@
handler_ = host2->CreateRequestHandler(
std::make_unique<AppCacheURLLoaderRequest>(request),
ResourceType::kMainFrame, false);
- handler_->MaybeCreateLoader(request, nullptr, nullptr, base::DoNothing(),
+ handler_->MaybeCreateLoader(request, nullptr, base::DoNothing(),
base::DoNothing());
}
diff --git a/content/browser/loader/navigation_loader_interceptor.h b/content/browser/loader/navigation_loader_interceptor.h
index 27accae..acdda008 100644
--- a/content/browser/loader/navigation_loader_interceptor.h
+++ b/content/browser/loader/navigation_loader_interceptor.h
@@ -20,7 +20,6 @@
namespace content {
class BrowserContext;
-class ResourceContext;
struct ResourceRequest;
struct SubresourceLoaderParams;
class ThrottlingURLLoader;
@@ -30,6 +29,7 @@
// default URLLoader, e.g. the one from the network service.
// NavigationLoaderInterceptor is a per-request object and kept around during
// the lifetime of a navigation request (including multiple redirect legs).
+// All methods are called on the UI thread.
class CONTENT_EXPORT NavigationLoaderInterceptor {
public:
NavigationLoaderInterceptor() = default;
@@ -68,17 +68,9 @@
//
// |callback| and |fallback_callback| must not be invoked after the
// destruction of this interceptor.
- //
- // |browser_context| will only be non-null when this interceptor is running on
- // the UI thread, and |resource_context| will only be non-null when running on
- // the IO thread.
- //
- // TODO(http://crbug.com/824840): Once all interceptors support
- // running on UI, remove |resource_context|.
virtual void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) = 0;
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
index 12586a4..23a59f0 100644
--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -106,12 +106,10 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override {
- browser_interceptor_->MaybeCreateLoader(tentative_resource_request,
- browser_context, resource_context,
- std::move(callback));
+ browser_interceptor_->MaybeCreateLoader(
+ tentative_resource_request, browser_context, std::move(callback));
}
private:
@@ -568,7 +566,7 @@
if (interceptor_index_ < interceptors_.size()) {
auto* next_interceptor = interceptors_[interceptor_index_++].get();
next_interceptor->MaybeCreateLoader(
- *resource_request_, browser_context_, nullptr /* resource_context */,
+ *resource_request_, browser_context_,
base::BindOnce(&URLLoaderRequestController::MaybeStartLoader,
base::Unretained(this), next_interceptor),
base::BindOnce(
diff --git a/content/browser/loader/navigation_url_loader_impl_unittest.cc b/content/browser/loader/navigation_url_loader_impl_unittest.cc
index 963c4d5..78b01b12 100644
--- a/content/browser/loader/navigation_url_loader_impl_unittest.cc
+++ b/content/browser/loader/navigation_url_loader_impl_unittest.cc
@@ -74,7 +74,6 @@
void MaybeCreateLoader(const network::ResourceRequest& resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override {
std::move(callback).Run(base::BindOnce(
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 62f76a83f..d424a02 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -101,10 +101,9 @@
void ServiceWorkerControlleeRequestHandler::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
- BrowserContext* browser_context,
ResourceContext* resource_context,
- LoaderCallback callback,
- FallbackCallback fallback_callback) {
+ NavigationLoaderInterceptor::LoaderCallback callback,
+ NavigationLoaderInterceptor::FallbackCallback fallback_callback) {
// InitializeProvider() will update the host. This is important to do before
// falling back to network below, so service worker APIs still work even if
// the service worker is bypassed for request interception.
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.h b/content/browser/service_worker/service_worker_controllee_request_handler.h
index 02bbd1bc..910f7fb 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.h
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.h
@@ -25,6 +25,7 @@
namespace content {
+class ResourceContext;
class ServiceWorkerContextCore;
class ServiceWorkerProviderHost;
class ServiceWorkerRegistration;
@@ -32,8 +33,7 @@
// Handles main resource requests for service worker clients (documents and
// shared workers).
-class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler final
- : public NavigationLoaderInterceptor {
+class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler final {
public:
// If |skip_service_worker| is true, service workers are bypassed for
// request interception.
@@ -42,23 +42,22 @@
base::WeakPtr<ServiceWorkerProviderHost> provider_host,
ResourceType resource_type,
bool skip_service_worker);
- ~ServiceWorkerControlleeRequestHandler() override;
+ ~ServiceWorkerControlleeRequestHandler();
// NavigationLoaderInterceptor overrides:
// This could get called multiple times during the lifetime in redirect
// cases. (In fallback-to-network cases we basically forward the request
// to the request to the next request handler)
- void MaybeCreateLoader(const network::ResourceRequest& tentative_request,
- BrowserContext* browser_context,
- ResourceContext* resource_context,
- LoaderCallback callback,
- FallbackCallback fallback_callback) override;
+ void MaybeCreateLoader(
+ const network::ResourceRequest& tentative_request,
+ ResourceContext* resource_context,
+ NavigationLoaderInterceptor::LoaderCallback callback,
+ NavigationLoaderInterceptor::FallbackCallback fallback_callback);
// Returns params with the ControllerServiceWorkerInfoPtr if we have found
// a matching controller service worker for the |request| that is given
// to MaybeCreateLoader(). Otherwise this returns base::nullopt.
- base::Optional<SubresourceLoaderParams> MaybeCreateSubresourceLoaderParams()
- override;
+ base::Optional<SubresourceLoaderParams> MaybeCreateSubresourceLoaderParams();
// Does all initialization of |provider_host_| for a request.
bool InitializeProvider(const network::ResourceRequest& tentative_request);
@@ -112,8 +111,8 @@
bool force_update_started_;
base::TimeTicks registration_lookup_start_time_;
- LoaderCallback loader_callback_;
- FallbackCallback fallback_callback_;
+ NavigationLoaderInterceptor::LoaderCallback loader_callback_;
+ NavigationLoaderInterceptor::FallbackCallback fallback_callback_;
base::WeakPtrFactory<ServiceWorkerControlleeRequestHandler> weak_factory_{
this};
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
index a0678b0..f8f3c1e 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
@@ -64,8 +64,8 @@
resource_request.url = request_->url();
resource_request.resource_type = static_cast<int>(resource_type_);
resource_request.headers = request()->extra_request_headers();
- handler_->MaybeCreateLoader(resource_request, nullptr, nullptr,
- base::DoNothing(), base::DoNothing());
+ handler_->MaybeCreateLoader(resource_request, nullptr, base::DoNothing(),
+ base::DoNothing());
}
ServiceWorkerNavigationLoader* loader() { return handler_->loader(); }
diff --git a/content/browser/service_worker/service_worker_navigation_loader_interceptor.cc b/content/browser/service_worker/service_worker_navigation_loader_interceptor.cc
index 0aa99fd..efac1e6b 100644
--- a/content/browser/service_worker/service_worker_navigation_loader_interceptor.cc
+++ b/content/browser/service_worker/service_worker_navigation_loader_interceptor.cc
@@ -79,7 +79,6 @@
blink::mojom::ServiceWorkerContainerHostAssociatedRequest host_request,
blink::mojom::ServiceWorkerContainerAssociatedPtrInfo client_ptr_info,
const network::ResourceRequest& tentative_resource_request,
- BrowserContext* browser_context,
NavigationLoaderInterceptor::LoaderCallback loader_callback,
NavigationLoaderInterceptor::FallbackCallback fallback_callback,
bool initialize_provider_only) {
@@ -149,7 +148,7 @@
// It's safe to bind the raw |handle_core| to the callback because it owns the
// interceptor, which invokes the callback.
handle_core->interceptor()->MaybeCreateLoader(
- tentative_resource_request, browser_context, resource_context,
+ tentative_resource_request, resource_context,
base::BindOnce(&LoaderCallbackWrapperOnIO, handle_core, interceptor_on_ui,
std::move(loader_callback)),
base::BindOnce(&FallbackCallbackWrapperOnIO, interceptor_on_ui,
@@ -176,11 +175,9 @@
void ServiceWorkerNavigationLoaderInterceptor::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback loader_callback,
FallbackCallback fallback_callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- DCHECK(!resource_context);
DCHECK(handle_);
blink::mojom::ServiceWorkerContainerHostAssociatedRequest host_request;
@@ -217,8 +214,8 @@
base::BindOnce(&MaybeCreateLoaderOnIO, GetWeakPtr(), handle_->core(),
params_, std::move(host_request),
std::move(client_ptr_info), tentative_resource_request,
- browser_context, std::move(loader_callback),
- std::move(fallback_callback), initialize_provider_only));
+ std::move(loader_callback), std::move(fallback_callback),
+ initialize_provider_only));
if (original_callback)
std::move(original_callback).Run({});
diff --git a/content/browser/service_worker/service_worker_navigation_loader_interceptor.h b/content/browser/service_worker/service_worker_navigation_loader_interceptor.h
index a8955a8f..923237c 100644
--- a/content/browser/service_worker/service_worker_navigation_loader_interceptor.h
+++ b/content/browser/service_worker/service_worker_navigation_loader_interceptor.h
@@ -57,7 +57,6 @@
// to the request to the next request handler)
void MaybeCreateLoader(const network::ResourceRequest& tentative_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override;
// Returns params with the ControllerServiceWorkerInfoPtr if we have found
diff --git a/content/browser/web_package/bundled_exchanges_handle.cc b/content/browser/web_package/bundled_exchanges_handle.cc
index 21c4732..0cf470d 100644
--- a/content/browser/web_package/bundled_exchanges_handle.cc
+++ b/content/browser/web_package/bundled_exchanges_handle.cc
@@ -73,7 +73,6 @@
// NavigationLoaderInterceptor implementation
void MaybeCreateLoader(const network::ResourceRequest& resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/content/browser/web_package/prefetched_signed_exchange_cache.cc b/content/browser/web_package/prefetched_signed_exchange_cache.cc
index 1b5a7baf..5a72781 100644
--- a/content/browser/web_package/prefetched_signed_exchange_cache.cc
+++ b/content/browser/web_package/prefetched_signed_exchange_cache.cc
@@ -387,7 +387,6 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override {
if (state_ == State::kInitial &&
diff --git a/content/browser/web_package/signed_exchange_request_handler.cc b/content/browser/web_package/signed_exchange_request_handler.cc
index 9a29e53..11a52c20 100644
--- a/content/browser/web_package/signed_exchange_request_handler.cc
+++ b/content/browser/web_package/signed_exchange_request_handler.cc
@@ -51,7 +51,6 @@
void SignedExchangeRequestHandler::MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) {
if (!signed_exchange_loader_) {
diff --git a/content/browser/web_package/signed_exchange_request_handler.h b/content/browser/web_package/signed_exchange_request_handler.h
index f919c19..079714a 100644
--- a/content/browser/web_package/signed_exchange_request_handler.h
+++ b/content/browser/web_package/signed_exchange_request_handler.h
@@ -48,7 +48,6 @@
void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback,
FallbackCallback fallback_callback) override;
bool MaybeCreateLoaderForResponse(
diff --git a/content/browser/worker_host/worker_script_loader.cc b/content/browser/worker_host/worker_script_loader.cc
index eef8c2f..96f9801 100644
--- a/content/browser/worker_host/worker_script_loader.cc
+++ b/content/browser/worker_host/worker_script_loader.cc
@@ -99,7 +99,7 @@
if (interceptor_index_ < interceptors_.size()) {
auto* interceptor = interceptors_[interceptor_index_++].get();
interceptor->MaybeCreateLoader(
- resource_request_, browser_context, nullptr /* resource_context */,
+ resource_request_, browser_context,
base::BindOnce(&WorkerScriptLoader::MaybeStartLoader,
weak_factory_.GetWeakPtr(), interceptor),
base::BindOnce(&WorkerScriptLoader::LoadFromNetwork,
diff --git a/content/public/browser/url_loader_request_interceptor.h b/content/public/browser/url_loader_request_interceptor.h
index a676a1fa..e504d8d 100644
--- a/content/public/browser/url_loader_request_interceptor.h
+++ b/content/public/browser/url_loader_request_interceptor.h
@@ -17,13 +17,13 @@
namespace content {
class BrowserContext;
-class ResourceContext;
// URLLoaderRequestInterceptor is given a chance to create a URLLoader and
// intercept a navigation request before the request is handed off to the
// default URLLoader, e.g. the one from the network service.
// URLLoaderRequestInterceptor is a per-request object and kept around during
// the lifetime of a navigation request (including multiple redirect legs).
+// All methods are called on the UI thread.
class URLLoaderRequestInterceptor {
public:
URLLoaderRequestInterceptor() = default;
@@ -44,17 +44,9 @@
// request later passed to the RequestHandler given to |callback| may not be
// exactly the same. See documentation for
// NavigationLoaderInterceptor::MaybeCreateLoader.
- //
- // |browser_context| will only be non-null when this interceptor is running on
- // the UI thread, and |resource_context| will only be non-null when running on
- // the IO thread.
- //
- // TODO(http://crbug.com/824840): Once all interceptors support
- // running on UI, remove |resource_context|.
virtual void MaybeCreateLoader(
const network::ResourceRequest& tentative_resource_request,
BrowserContext* browser_context,
- ResourceContext* resource_context,
LoaderCallback callback) = 0;
};
