| Index: content/browser/storage_partition_impl.cc
|
| diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
|
| index d5b83bce34d24c27ee2efaef67f6adfafb910187..5055f001d532fae0eba131cf38b6bc7a2c9ce314 100644
|
| --- a/content/browser/storage_partition_impl.cc
|
| +++ b/content/browser/storage_partition_impl.cc
|
| @@ -11,6 +11,7 @@
|
| #include "content/browser/geofencing/geofencing_manager.h"
|
| #include "content/browser/gpu/shader_disk_cache.h"
|
| #include "content/browser/host_zoom_map_impl.h"
|
| +#include "content/browser/navigator_connect/navigator_connect_context.h"
|
| #include "content/common/dom_storage/dom_storage_types.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -370,7 +371,8 @@ StoragePartitionImpl::StoragePartitionImpl(
|
| WebRTCIdentityStore* webrtc_identity_store,
|
| storage::SpecialStoragePolicy* special_storage_policy,
|
| GeofencingManager* geofencing_manager,
|
| - HostZoomLevelContext* host_zoom_level_context)
|
| + HostZoomLevelContext* host_zoom_level_context,
|
| + NavigatorConnectContext* navigator_connect_context)
|
| : partition_path_(partition_path),
|
| quota_manager_(quota_manager),
|
| appcache_service_(appcache_service),
|
| @@ -382,7 +384,8 @@ StoragePartitionImpl::StoragePartitionImpl(
|
| webrtc_identity_store_(webrtc_identity_store),
|
| special_storage_policy_(special_storage_policy),
|
| geofencing_manager_(geofencing_manager),
|
| - host_zoom_level_context_(host_zoom_level_context) {
|
| + host_zoom_level_context_(host_zoom_level_context),
|
| + navigator_connect_context_(navigator_connect_context) {
|
| }
|
|
|
| StoragePartitionImpl::~StoragePartitionImpl() {
|
| @@ -485,18 +488,16 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
|
| new HostZoomLevelContext(
|
| context->CreateZoomLevelDelegate(partition_path)));
|
|
|
| - return new StoragePartitionImpl(partition_path,
|
| - quota_manager.get(),
|
| - appcache_service.get(),
|
| - filesystem_context.get(),
|
| - database_tracker.get(),
|
| - dom_storage_context.get(),
|
| - indexed_db_context.get(),
|
| - service_worker_context.get(),
|
| - webrtc_identity_store.get(),
|
| - special_storage_policy.get(),
|
| - geofencing_manager.get(),
|
| - host_zoom_level_context.get());
|
| + scoped_refptr<NavigatorConnectContext> navigator_connect_context =
|
| + new NavigatorConnectContext(service_worker_context);
|
| +
|
| + return new StoragePartitionImpl(
|
| + partition_path, quota_manager.get(), appcache_service.get(),
|
| + filesystem_context.get(), database_tracker.get(),
|
| + dom_storage_context.get(), indexed_db_context.get(),
|
| + service_worker_context.get(), webrtc_identity_store.get(),
|
| + special_storage_policy.get(), geofencing_manager.get(),
|
| + host_zoom_level_context.get(), navigator_connect_context.get());
|
| }
|
|
|
| base::FilePath StoragePartitionImpl::GetPath() {
|
| @@ -558,6 +559,10 @@ ZoomLevelDelegate* StoragePartitionImpl::GetZoomLevelDelegate() {
|
| return host_zoom_level_context_->GetZoomLevelDelegate();
|
| }
|
|
|
| +NavigatorConnectContext* StoragePartitionImpl::GetNavigatorConnectContext() {
|
| + return navigator_connect_context_.get();
|
| +}
|
| +
|
| void StoragePartitionImpl::ClearDataImpl(
|
| uint32 remove_mask,
|
| uint32 quota_storage_remove_mask,
|
|
|