diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc index e9ad038..2a10c80 100644 --- content/browser/appcache/appcache_internals_ui.cc +++ content/browser/appcache/appcache_internals_ui.cc @@ -369,8 +369,8 @@ void AppCacheInternalsUI::CreateProxyForPartition( StoragePartition* storage_partition) { scoped_refptr proxy = new Proxy(weak_ptr_factory_.GetWeakPtr(), storage_partition->GetPath()); - proxy->Initialize(static_cast(storage_partition) - ->GetAppCacheService()); + proxy->Initialize(static_cast( + storage_partition->GetAppCacheService())); appcache_proxies_.push_back(proxy); } diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc index 92a2e89..e4cacfe 100644 --- content/browser/blob_storage/chrome_blob_storage_context.cc +++ content/browser/blob_storage/chrome_blob_storage_context.cc @@ -76,6 +76,11 @@ class BlobHandleImpl : public BlobHandle { ChromeBlobStorageContext::ChromeBlobStorageContext() {} +// static +const void* ChromeBlobStorageContext::GetUserDataKey() { + return kBlobStorageContextKeyName; +} + ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor( BrowserContext* context) { if (!context->GetUserData(kBlobStorageContextKeyName)) { diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h index ad4a2a2..7c4212c 100644 --- content/browser/blob_storage/chrome_blob_storage_context.h +++ content/browser/blob_storage/chrome_blob_storage_context.h @@ -45,6 +45,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext public: ChromeBlobStorageContext(); + static const void* GetUserDataKey(); static ChromeBlobStorageContext* GetFor( BrowserContext* browser_context); diff --git content/browser/bluetooth/web_bluetooth_service_impl.cc content/browser/bluetooth/web_bluetooth_service_impl.cc index 36d4ea7..f696c5b 100644 --- content/browser/bluetooth/web_bluetooth_service_impl.cc +++ content/browser/bluetooth/web_bluetooth_service_impl.cc @@ -1194,9 +1194,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() { } BluetoothAllowedDevices& WebBluetoothServiceImpl::allowed_devices() { - StoragePartitionImpl* partition = static_cast( + StoragePartition* partition = BrowserContext::GetDefaultStoragePartition( - web_contents()->GetBrowserContext())); + web_contents()->GetBrowserContext()); scoped_refptr allowed_devices_map = partition->GetBluetoothAllowedDevicesMap(); return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin()); diff --git content/browser/browser_context.cc content/browser/browser_context.cc index 0f23bbe..b21982f 100644 --- content/browser/browser_context.cc +++ content/browser/browser_context.cc @@ -125,7 +125,14 @@ StoragePartition* GetStoragePartitionFromConfig( if (browser_context->IsOffTheRecord()) in_memory = true; - return partition_map->Get(partition_domain, partition_name, in_memory); + StoragePartitionImpl* partition_impl = + partition_map->Get(partition_domain, partition_name, in_memory); + if (partition_impl->browser_context() == browser_context) + return partition_impl; + + // |browser_context| is a CefBrowserContextProxy object. + return partition_impl->browser_context()-> + GetStoragePartitionProxy(browser_context, partition_impl); } void SaveSessionStateOnIOThread( @@ -543,6 +550,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor( BrowserContext::BrowserContext() : media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {} +// static +const void* BrowserContext::GetStoragePartitionMapUserDataKey() { + return kStoragePartitionMapKeyName; +} + BrowserContext::~BrowserContext() { CHECK(GetUserData(kMojoWasInitialized)) << "Attempting to destroy a BrowserContext that never called " diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc index 242d33e..4dfb463 100644 --- content/browser/devtools/protocol/service_worker_handler.cc +++ content/browser/devtools/protocol/service_worker_handler.cc @@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent( if (!base::StringToInt64(registration_id, &id)) return CreateInvalidVersionIdErrorResponse(); - StoragePartitionImpl* partition = - static_cast(BrowserContext::GetStoragePartition( + StoragePartition* partition = BrowserContext::GetStoragePartition( render_frame_host_->GetProcess()->GetBrowserContext(), - render_frame_host_->GetSiteInstance())); + render_frame_host_->GetSiteInstance()); BackgroundSyncContext* sync_context = partition->GetBackgroundSyncContext(); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc index f32156a..c2373f8 100644 --- content/browser/loader/navigation_url_loader_network_service.cc +++ content/browser/loader/navigation_url_loader_network_service.cc @@ -196,8 +196,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService( : nullptr, appcache_handle ? appcache_handle->core() : nullptr, request_info_.get(), base::Passed(std::move(factory_ptr_info)), - static_cast(storage_partition) - ->url_loader_factory_getter(), + scoped_refptr( + storage_partition->url_loader_factory_getter()), base::Bind(&GetWebContentsFromFrameTreeNodeID, request_info_->frame_tree_node_id), base::Passed(std::move(loader_associated_request)), diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc index 73f3cba..55d488b 100644 --- content/browser/payments/payment_app_provider_impl.cc +++ content/browser/payments/payment_app_provider_impl.cc @@ -153,8 +153,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps( GetAllPaymentAppsCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - StoragePartitionImpl* partition = static_cast( - BrowserContext::GetDefaultStoragePartition(browser_context)); + StoragePartition* partition = + BrowserContext::GetDefaultStoragePartition(browser_context); scoped_refptr payment_app_context = partition->GetPaymentAppContext(); @@ -171,10 +171,11 @@ void PaymentAppProviderImpl::InvokePaymentApp( const InvokePaymentAppCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - StoragePartitionImpl* partition = static_cast( - BrowserContext::GetDefaultStoragePartition(browser_context)); + StoragePartition* partition = + BrowserContext::GetDefaultStoragePartition(browser_context); scoped_refptr service_worker_context = - partition->GetServiceWorkerContext(); + static_cast( + partition->GetServiceWorkerContext()); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc index cbd667c..c0158c9 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, // own non-shared process. if (partition != default_partition || is_for_guests_only) { RenderProcessHostImpl* host = new RenderProcessHostImpl( - browser_context_, static_cast(partition), + browser_context_, partition, is_for_guests_only); host->SetIsNeverSuitableForReuse(); return host; @@ -494,7 +494,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, return host_; host_ = new RenderProcessHostImpl( - browser_context_, static_cast(partition), + browser_context_, partition, false /* for guests only */); host_->SetIsNeverSuitableForReuse(); host_->AddObserver(this); @@ -907,7 +907,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) { RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, - StoragePartitionImpl* storage_partition_impl, + StoragePartition* storage_partition_impl, bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), @@ -939,7 +939,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( indexed_db_factory_(new IndexedDBDispatcherHost( id_, storage_partition_impl_->GetURLRequestContext(), - storage_partition_impl_->GetIndexedDBContext(), + static_cast( + storage_partition_impl_->GetIndexedDBContext()), ChromeBlobStorageContext::GetFor(browser_context_))), channel_connected_(false), sent_render_process_ready_(false), @@ -970,7 +971,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( - GetID(), storage_partition_impl_->GetServiceWorkerContext())); + GetID(), static_cast( + storage_partition_impl_->GetServiceWorkerContext()))); AddObserver(indexed_db_factory_.get()); #if defined(OS_MACOSX) @@ -1176,7 +1178,7 @@ bool RenderProcessHostImpl::Init() { } void RenderProcessHostImpl::EnableSendQueue() { - if (!channel_) + if (!channel_ && browser_context_) InitializeChannelProxy(); } @@ -1273,6 +1275,22 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); + + // Cast to the derived type from StoragePartitionImpl. + auto app_cache_service = static_cast( + storage_partition_impl_->GetAppCacheService()); + auto dom_storage_context = static_cast( + storage_partition_impl_->GetDOMStorageContext()); + auto indexed_db_context = static_cast( + storage_partition_impl_->GetIndexedDBContext()); + auto cache_storage_context = static_cast( + storage_partition_impl_->GetCacheStorageContext()); + auto service_worker_context = static_cast( + storage_partition_impl_->GetServiceWorkerContext()); + auto platform_notification_context = + static_cast( + storage_partition_impl_->GetPlatformNotificationContext()); + AddFilter(new ResourceSchedulerFilter(GetID())); MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages @@ -1287,8 +1305,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { new RenderMessageFilter( GetID(), GetBrowserContext(), request_context.get(), widget_helper_.get(), media_internals, - storage_partition_impl_->GetDOMStorageContext(), - storage_partition_impl_->GetCacheStorageContext())); + dom_storage_context, + cache_storage_context)); AddFilter(render_message_filter.get()); render_frame_message_filter_ = new RenderFrameMessageFilter( @@ -1317,10 +1335,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { ChromeBlobStorageContext::GetFor(browser_context); resource_message_filter_ = new ResourceMessageFilter( - GetID(), storage_partition_impl_->GetAppCacheService(), + GetID(), app_cache_service, blob_storage_context.get(), storage_partition_impl_->GetFileSystemContext(), - storage_partition_impl_->GetServiceWorkerContext(), get_contexts_callback, + service_worker_context, get_contexts_callback, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); AddFilter(resource_message_filter_.get()); @@ -1344,10 +1362,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter( new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); AddFilter(new AppCacheDispatcherHost( - storage_partition_impl_->GetAppCacheService(), GetID())); + app_cache_service, GetID())); AddFilter(new ClipboardMessageFilter(blob_storage_context)); AddFilter(new DOMStorageMessageFilter( - storage_partition_impl_->GetDOMStorageContext())); + dom_storage_context)); #if BUILDFLAG(ENABLE_WEBRTC) peer_connection_tracker_host_ = new PeerConnectionTrackerHost( @@ -1386,13 +1404,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { scoped_refptr cache_storage_filter = new CacheStorageDispatcherHost(); - cache_storage_filter->Init(storage_partition_impl_->GetCacheStorageContext()); + cache_storage_filter->Init(cache_storage_context); AddFilter(cache_storage_filter.get()); scoped_refptr service_worker_filter = new ServiceWorkerDispatcherHost(GetID(), resource_context); - service_worker_filter->Init( - storage_partition_impl_->GetServiceWorkerContext()); + service_worker_filter->Init(service_worker_context); AddFilter(service_worker_filter.get()); AddFilter(new SharedWorkerMessageFilter( @@ -1400,12 +1417,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { WorkerStoragePartition( storage_partition_impl_->GetURLRequestContext(), storage_partition_impl_->GetMediaURLRequestContext(), - storage_partition_impl_->GetAppCacheService(), + app_cache_service, storage_partition_impl_->GetQuotaManager(), storage_partition_impl_->GetFileSystemContext(), storage_partition_impl_->GetDatabaseTracker(), - storage_partition_impl_->GetIndexedDBContext(), - storage_partition_impl_->GetServiceWorkerContext()), + indexed_db_context, + service_worker_context), base::Bind(&RenderWidgetHelper::GetNextRoutingID, base::Unretained(widget_helper_.get())))); @@ -1421,11 +1438,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { GetID(), storage_partition_impl_->GetQuotaManager(), GetContentClient()->browser()->CreateQuotaPermissionContext())); - scoped_refptr service_worker_context( - static_cast( - storage_partition_impl_->GetServiceWorkerContext())); notification_message_filter_ = new NotificationMessageFilter( - GetID(), storage_partition_impl_->GetPlatformNotificationContext(), + GetID(), platform_notification_context, resource_context, service_worker_context, browser_context); AddFilter(notification_message_filter_.get()); @@ -1441,6 +1455,11 @@ void RenderProcessHostImpl::CreateMessageFilters() { void RenderProcessHostImpl::RegisterMojoInterfaces() { auto registry = base::MakeUnique(); + // Cast to the derived type from StoragePartitionImpl. + auto platform_notification_context = + static_cast( + storage_partition_impl_->GetPlatformNotificationContext()); + channel_->AddAssociatedInterfaceForIOThread( base::Bind(&IndexedDBDispatcherHost::AddBinding, base::Unretained(indexed_db_factory_.get()))); @@ -1488,8 +1507,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { AddUIThreadInterface( registry.get(), base::Bind(&PlatformNotificationContextImpl::CreateService, - base::Unretained( - storage_partition_impl_->GetPlatformNotificationContext()), + base::Unretained(platform_notification_context), GetID())); AddUIThreadInterface( registry.get(), @@ -1725,6 +1743,7 @@ void RenderProcessHostImpl::ForceReleaseWorkerRefCounts() { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!is_worker_ref_count_disabled_); is_worker_ref_count_disabled_ = true; + browser_context_ = nullptr; if (!GetWorkerRefCount()) return; service_worker_ref_count_ = 0; @@ -3065,8 +3084,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance( g_render_process_host_factory_->CreateRenderProcessHost( browser_context, site_instance); } else { - StoragePartitionImpl* partition = static_cast( - BrowserContext::GetStoragePartition(browser_context, site_instance)); + StoragePartition* partition = + BrowserContext::GetStoragePartition(browser_context, site_instance); render_process_host = new RenderProcessHostImpl( browser_context, partition, is_for_guests_only); } diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h index 8d5033e..45b8a7c 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -80,7 +80,6 @@ class RenderWidgetHostImpl; class ResourceMessageFilter; class SiteInstanceImpl; class StoragePartition; -class StoragePartitionImpl; typedef base::Thread* (*RendererMainThreadFactoryFunction)( const InProcessChildThreadParams& params); @@ -112,7 +111,7 @@ class CONTENT_EXPORT RenderProcessHostImpl public NON_EXPORTED_BASE(mojom::AssociatedInterfaceProvider) { public: RenderProcessHostImpl(BrowserContext* browser_context, - StoragePartitionImpl* storage_partition_impl, + StoragePartition* storage_partition_impl, bool is_for_guests_only); ~RenderProcessHostImpl() override; @@ -581,10 +580,10 @@ class CONTENT_EXPORT RenderProcessHostImpl // called. int instance_id_ = 1; - BrowserContext* const browser_context_; + BrowserContext* browser_context_; // Owned by |browser_context_|. - StoragePartitionImpl* storage_partition_impl_; + StoragePartition* storage_partition_impl_; // The observers watching our lifetime. base::ObserverList observers_; diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h index 58a6de1..4835648 100644 --- content/browser/storage_partition_impl.h +++ content/browser/storage_partition_impl.h @@ -110,12 +110,11 @@ class CONTENT_EXPORT StoragePartitionImpl const base::Closure& callback) override; void Flush() override; void ClearBluetoothAllowedDevicesMapForTesting() override; - - BackgroundFetchContext* GetBackgroundFetchContext(); - BackgroundSyncContext* GetBackgroundSyncContext(); - PaymentAppContextImpl* GetPaymentAppContext(); - BroadcastChannelProvider* GetBroadcastChannelProvider(); - BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap(); + BackgroundFetchContext* GetBackgroundFetchContext() override; + BackgroundSyncContext* GetBackgroundSyncContext() override; + PaymentAppContextImpl* GetPaymentAppContext() override; + BroadcastChannelProvider* GetBroadcastChannelProvider() override; + BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap() override; // mojom::StoragePartitionService interface. void OpenLocalStorage( @@ -124,17 +123,20 @@ class CONTENT_EXPORT StoragePartitionImpl // Returns the NetworkContext associated with this storage partition. Only // used when the network service is enabled. - mojom::NetworkContext* network_context() { return network_context_.get(); } + mojom::NetworkContext* network_context() override { + return network_context_.get(); + } - scoped_refptr url_loader_factory_getter() { - return url_loader_factory_getter_; + URLLoaderFactoryGetter* url_loader_factory_getter() override { + return url_loader_factory_getter_.get(); } // Can return nullptr while |this| is being destroyed. - BrowserContext* browser_context() const; + BrowserContext* browser_context() const override; // Called by each renderer process once. - void Bind(mojo::InterfaceRequest request); + void Bind(mojo::InterfaceRequest request) + override; struct DataDeletionHelper; struct QuotaManagedDataDeletionHelper; diff --git content/browser/streams/stream_context.cc content/browser/streams/stream_context.cc index 22e3c06..883114d 100644 --- content/browser/streams/stream_context.cc +++ content/browser/streams/stream_context.cc @@ -22,6 +22,11 @@ namespace content { StreamContext::StreamContext() {} +// static +const void* StreamContext::GetUserDataKey() { + return kStreamContextKeyName; +} + StreamContext* StreamContext::GetFor(BrowserContext* context) { if (!context->GetUserData(kStreamContextKeyName)) { scoped_refptr stream = new StreamContext(); diff --git content/browser/streams/stream_context.h content/browser/streams/stream_context.h index 075ae3e..57fb5fd 100644 --- content/browser/streams/stream_context.h +++ content/browser/streams/stream_context.h @@ -29,6 +29,7 @@ class StreamContext public: StreamContext(); + CONTENT_EXPORT static const void* GetUserDataKey(); CONTENT_EXPORT static StreamContext* GetFor(BrowserContext* browser_context); void InitializeOnIOThread(); diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc index e85627c..3f55353 100644 --- content/browser/webui/web_ui_url_loader_factory.cc +++ content/browser/webui/web_ui_url_loader_factory.cc @@ -18,7 +18,6 @@ #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/histogram_internals_url_loader.h" #include "content/browser/resource_context_impl.h" -#include "content/browser/storage_partition_impl.h" #include "content/browser/webui/network_error_url_loader.h" #include "content/browser/webui/url_data_manager_backend.h" #include "content/browser/webui/url_data_source_impl.h" @@ -26,6 +25,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "mojo/public/cpp/bindings/binding_set.h" @@ -210,8 +210,8 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory, public: WebUIURLLoaderFactory(FrameTreeNode* ftn) : frame_tree_node_id_(ftn->frame_tree_node_id()), - storage_partition_(static_cast( - ftn->current_frame_host()->GetProcess()->GetStoragePartition())) { + storage_partition_( + ftn->current_frame_host()->GetProcess()->GetStoragePartition()) { ftn->AddObserver(this); } @@ -278,7 +278,7 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory, private: int frame_tree_node_id_; - StoragePartitionImpl* storage_partition_; + StoragePartition* storage_partition_; mojo::BindingSet loader_factory_bindings_; DISALLOW_COPY_AND_ASSIGN(WebUIURLLoaderFactory); diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h index 7a895f2..687da7c 100644 --- content/public/browser/browser_context.h +++ content/public/browser/browser_context.h @@ -185,6 +185,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { BrowserContext(); + static const void* GetStoragePartitionMapUserDataKey(); + ~BrowserContext() override; // Shuts down the storage partitions associated to this browser context. @@ -266,6 +268,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { const base::FilePath& partition_path, bool in_memory) = 0; + // CEF returns a proxy object that forwards method calls to |partition_impl|. + virtual content::StoragePartition* GetStoragePartitionProxy( + BrowserContext* browser_context, + content::StoragePartition* partition_impl) { + NOTREACHED(); + return nullptr; + } + using StaticServiceMap = std::map; // Registers per-browser-context services to be loaded in the browser process diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h index 60e5c7d..14f50b3 100644 --- content/public/browser/storage_partition.h +++ content/public/browser/storage_partition.h @@ -13,6 +13,7 @@ #include "base/files/file_path.h" #include "base/time/time.h" #include "content/common/content_export.h" +#include "mojo/public/cpp/bindings/binding_set.h" #include "net/cookies/cookie_store.h" class GURL; @@ -41,12 +42,18 @@ class DatabaseTracker; namespace content { class AppCacheService; +class BackgroundFetchContext; +class BackgroundSyncContext; +class BluetoothAllowedDevicesMap; +class BroadcastChannelProvider; class BrowserContext; class CacheStorageContext; class DOMStorageContext; class IndexedDBContext; +class PaymentAppContextImpl; class PlatformNotificationContext; class ServiceWorkerContext; +class URLLoaderFactoryGetter; #if !defined(OS_ANDROID) class HostZoomLevelContext; @@ -54,6 +61,11 @@ class HostZoomMap; class ZoomLevelDelegate; #endif // !defined(OS_ANDROID) +namespace mojom { +class NetworkContext; +class StoragePartitionService; +} + // Defines what persistent state a child process can access. // // The StoragePartition defines the view each child process has of the @@ -79,6 +91,11 @@ class CONTENT_EXPORT StoragePartition { virtual ZoomLevelDelegate* GetZoomLevelDelegate() = 0; #endif // !defined(OS_ANDROID) virtual PlatformNotificationContext* GetPlatformNotificationContext() = 0; + virtual BackgroundFetchContext* GetBackgroundFetchContext() = 0; + virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0; + virtual PaymentAppContextImpl* GetPaymentAppContext() = 0; + virtual BroadcastChannelProvider* GetBroadcastChannelProvider() = 0; + virtual BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap() = 0; enum : uint32_t { REMOVE_DATA_MASK_APPCACHE = 1 << 0, @@ -184,6 +201,14 @@ class CONTENT_EXPORT StoragePartition { // Clear the bluetooth allowed devices map. For test use only. virtual void ClearBluetoothAllowedDevicesMapForTesting() = 0; + virtual mojom::NetworkContext* network_context() = 0; + virtual URLLoaderFactoryGetter* url_loader_factory_getter() = 0; + virtual BrowserContext* browser_context() const = 0; + + // Called by each renderer process once. + virtual void Bind( + mojo::InterfaceRequest request) = 0; + protected: virtual ~StoragePartition() {} };