Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11891)

Unified Diff: content/browser/storage_partition_impl.cc

Issue 2959903002: Revert of Implement dumb URLLoader{Factory} for ServiceWorker script loading (Closed)
Patch Set: pull master and rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index 446cce06e957d73ade8de5468e585514d448511f..3af33049b989be6c09dcece3c33c12d48aa81076 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -496,6 +496,8 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
partition->cache_storage_context_->Init(path, quota_manager_proxy);
partition->service_worker_context_ = new ServiceWorkerContextWrapper(context);
+ partition->service_worker_context_->Init(path, quota_manager_proxy.get(),
+ context->GetSpecialStoragePolicy());
partition->service_worker_context_->set_storage_partition(partition.get());
partition->appcache_service_ =
@@ -527,9 +529,6 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
partition->bluetooth_allowed_devices_map_ = new BluetoothAllowedDevicesMap();
- scoped_refptr<ChromeBlobStorageContext> blob_context =
- ChromeBlobStorageContext::GetFor(context);
-
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableNetworkService)) {
mojom::NetworkServicePtr network_service;
@@ -543,6 +542,8 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
network_service->CreateNetworkContext(
MakeRequest(&partition->network_context_), std::move(context_params));
+ scoped_refptr<ChromeBlobStorageContext> blob_context =
+ ChromeBlobStorageContext::GetFor(context);
BlobURLLoaderFactory::BlobContextGetter blob_getter =
base::BindOnce(&BlobStorageContextGetter, blob_context);
partition->blob_url_loader_factory_ = new BlobURLLoaderFactory(
@@ -552,10 +553,6 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
partition->url_loader_factory_getter_->Initialize(partition.get());
}
- partition->service_worker_context_->Init(
- path, quota_manager_proxy.get(), context->GetSpecialStoragePolicy(),
- blob_context.get(), partition->url_loader_factory_getter_.get());
-
return partition;
}

Powered by Google App Engine
This is Rietveld 408576698