mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision adb61db1 (#508578)
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
|
||||
index f7c812a2c9b1..d0f5c191a4f5 100644
|
||||
index 71bf90c54ae5..d3308da307d7 100644
|
||||
--- content/browser/appcache/appcache_internals_ui.cc
|
||||
+++ content/browser/appcache/appcache_internals_ui.cc
|
||||
@@ -372,8 +372,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
|
||||
@ -59,16 +59,18 @@ index 13d802fa72cd..a2d34d1d72eb 100644
|
||||
partition->GetBluetoothAllowedDevicesMap();
|
||||
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
|
||||
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
|
||||
index 42b002908c3b..f7d9c3933090 100644
|
||||
index 1e3eb64f87ba..e895554337c6 100644
|
||||
--- content/browser/browser_context.cc
|
||||
+++ content/browser/browser_context.cc
|
||||
@@ -125,7 +125,14 @@ StoragePartition* GetStoragePartitionFromConfig(
|
||||
@@ -126,8 +126,15 @@ StoragePartition* GetStoragePartitionFromConfig(
|
||||
if (browser_context->IsOffTheRecord())
|
||||
in_memory = true;
|
||||
|
||||
- return partition_map->Get(partition_domain, partition_name, in_memory);
|
||||
- return partition_map->Get(partition_domain, partition_name, in_memory,
|
||||
- can_create);
|
||||
+ StoragePartitionImpl* partition_impl =
|
||||
+ partition_map->Get(partition_domain, partition_name, in_memory);
|
||||
+ partition_map->Get(partition_domain, partition_name, in_memory,
|
||||
+ can_create);
|
||||
+ if (partition_impl->browser_context() == browser_context)
|
||||
+ return partition_impl;
|
||||
+
|
||||
@ -78,7 +80,7 @@ index 42b002908c3b..f7d9c3933090 100644
|
||||
}
|
||||
|
||||
void SaveSessionStateOnIOThread(
|
||||
@@ -544,6 +551,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
|
||||
@@ -548,6 +555,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
|
||||
BrowserContext::BrowserContext()
|
||||
: media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {}
|
||||
|
||||
@ -91,45 +93,72 @@ index 42b002908c3b..f7d9c3933090 100644
|
||||
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 c2fbb6a68dd3..8e5747a50908 100644
|
||||
index a65884075126..241653eb4fd6 100644
|
||||
--- content/browser/devtools/protocol/service_worker_handler.cc
|
||||
+++ content/browser/devtools/protocol/service_worker_handler.cc
|
||||
@@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
|
||||
@@ -334,8 +334,7 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
|
||||
if (!base::StringToInt64(registration_id, &id))
|
||||
return CreateInvalidVersionIdErrorResponse();
|
||||
|
||||
- StoragePartitionImpl* partition =
|
||||
- static_cast<StoragePartitionImpl*>(BrowserContext::GetStoragePartition(
|
||||
+ StoragePartition* partition = BrowserContext::GetStoragePartition(
|
||||
render_frame_host_->GetProcess()->GetBrowserContext(),
|
||||
- render_frame_host_->GetSiteInstance()));
|
||||
+ render_frame_host_->GetSiteInstance());
|
||||
- static_cast<StoragePartitionImpl*>(process_->GetStoragePartition());
|
||||
+ StoragePartition* partition = process_->GetStoragePartition();
|
||||
BackgroundSyncContext* sync_context = partition->GetBackgroundSyncContext();
|
||||
|
||||
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
||||
diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
|
||||
index 4722f367c327..bd7720092bf2 100644
|
||||
index 68293acdadc6..ca613c9218c8 100644
|
||||
--- content/browser/download/download_manager_impl.cc
|
||||
+++ content/browser/download/download_manager_impl.cc
|
||||
@@ -81,8 +81,8 @@ scoped_refptr<URLLoaderFactoryGetter> GetURLLoaderFactoryGetter(
|
||||
@@ -69,9 +69,9 @@
|
||||
namespace content {
|
||||
namespace {
|
||||
|
||||
-StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
|
||||
- int render_process_id,
|
||||
- int render_frame_id) {
|
||||
+StoragePartition* GetStoragePartition(BrowserContext* context,
|
||||
+ int render_process_id,
|
||||
+ int render_frame_id) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
||||
SiteInstance* site_instance = nullptr;
|
||||
@@ -81,8 +81,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
|
||||
if (render_frame_host_)
|
||||
site_instance = render_frame_host_->GetSiteInstance();
|
||||
}
|
||||
- StoragePartitionImpl* partition = static_cast<StoragePartitionImpl*>(
|
||||
- return static_cast<StoragePartitionImpl*>(
|
||||
- BrowserContext::GetStoragePartition(context, site_instance));
|
||||
+ StoragePartition* partition =
|
||||
+ BrowserContext::GetStoragePartition(context, site_instance);
|
||||
return partition->url_loader_factory_getter();
|
||||
+ return BrowserContext::GetStoragePartition(context, site_instance);
|
||||
}
|
||||
|
||||
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
|
||||
@@ -737,14 +736,15 @@ void DownloadManagerImpl::DownloadUrl(
|
||||
if (base::FeatureList::IsEnabled(features::kNetworkService)) {
|
||||
std::unique_ptr<ResourceRequest> request = CreateResourceRequest(
|
||||
params.get());
|
||||
- StoragePartitionImpl* storage_partition =
|
||||
+ StoragePartition* storage_partition =
|
||||
GetStoragePartition(browser_context_, params->render_process_host_id(),
|
||||
params->render_frame_host_routing_id());
|
||||
BrowserThread::PostTaskAndReplyWithResult(
|
||||
BrowserThread::IO, FROM_HERE,
|
||||
base::BindOnce(
|
||||
&BeginResourceDownload, std::move(params), std::move(request),
|
||||
- storage_partition->url_loader_factory_getter(),
|
||||
+ base::WrapRefCounted(
|
||||
+ storage_partition->url_loader_factory_getter()),
|
||||
base::WrapRefCounted(storage_partition->GetFileSystemContext()),
|
||||
content::DownloadItem::kInvalidId, weak_factory_.GetWeakPtr()),
|
||||
base::BindOnce(&DownloadManagerImpl::AddUrlDownloadHandler,
|
||||
diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
|
||||
index 8a9139cc0c53..1feb90ab9d5e 100644
|
||||
index dadbbdcc8fc8..1fd206309eb8 100644
|
||||
--- content/browser/loader/navigation_url_loader_network_service.cc
|
||||
+++ content/browser/loader/navigation_url_loader_network_service.cc
|
||||
@@ -469,8 +469,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
|
||||
@@ -579,8 +579,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
|
||||
DCHECK(!request_controller_);
|
||||
request_controller_ = base::MakeUnique<URLLoaderRequestController>(
|
||||
std::move(new_request), resource_context,
|
||||
std::move(initial_handlers), std::move(new_request), resource_context,
|
||||
- static_cast<StoragePartitionImpl*>(storage_partition)
|
||||
- ->url_loader_factory_getter(),
|
||||
+ scoped_refptr<URLLoaderFactoryGetter>(
|
||||
@ -138,7 +167,7 @@ index 8a9139cc0c53..1feb90ab9d5e 100644
|
||||
BrowserThread::PostTask(
|
||||
BrowserThread::IO, FROM_HERE,
|
||||
diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
|
||||
index 7b72610e288a..6c95278110d6 100644
|
||||
index 337411c80e5a..7acc48a745a2 100644
|
||||
--- content/browser/payments/payment_app_provider_impl.cc
|
||||
+++ content/browser/payments/payment_app_provider_impl.cc
|
||||
@@ -328,10 +328,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
|
||||
@ -168,10 +197,10 @@ index 7b72610e288a..6c95278110d6 100644
|
||||
partition->GetPaymentAppContext();
|
||||
|
||||
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
|
||||
index 678135b37ee9..cdbdf8248453 100644
|
||||
index 44207cf02ab6..a59cd89a31f8 100644
|
||||
--- content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -489,9 +489,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver {
|
||||
@@ -493,9 +493,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver {
|
||||
SpareRenderProcessHostManager() {}
|
||||
|
||||
void WarmupSpareRenderProcessHost(BrowserContext* browser_context) {
|
||||
@ -183,7 +212,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
|
||||
if (spare_render_process_host_ &&
|
||||
matching_browser_context_ == browser_context &&
|
||||
@@ -630,11 +629,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
|
||||
@@ -634,11 +633,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
|
||||
// Gets the correct render process to use for this SiteInstance.
|
||||
RenderProcessHost* GetProcessHost(SiteInstance* site_instance,
|
||||
bool is_for_guests_only) {
|
||||
@ -199,7 +228,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
|
||||
// Is this the default storage partition? If it isn't, then just give it its
|
||||
// own non-shared process.
|
||||
@@ -1199,7 +1197,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
|
||||
@@ -1206,7 +1204,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) {
|
||||
// static
|
||||
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
BrowserContext* browser_context,
|
||||
@ -208,7 +237,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
SiteInstance* site_instance,
|
||||
bool is_for_guests_only) {
|
||||
if (g_render_process_host_factory_) {
|
||||
@@ -1208,8 +1206,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
@@ -1215,8 +1213,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
}
|
||||
|
||||
if (!storage_partition_impl) {
|
||||
@ -219,7 +248,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
}
|
||||
|
||||
return new RenderProcessHostImpl(browser_context, storage_partition_impl,
|
||||
@@ -1219,7 +1217,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
@@ -1226,7 +1224,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
|
||||
// static
|
||||
RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
|
||||
BrowserContext* browser_context,
|
||||
@ -228,7 +257,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
SiteInstance* site_instance,
|
||||
bool is_for_guests_only) {
|
||||
RenderProcessHost* render_process_host =
|
||||
@@ -1239,7 +1237,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
|
||||
@@ -1246,7 +1244,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost(
|
||||
|
||||
RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
BrowserContext* browser_context,
|
||||
@ -237,7 +266,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
bool is_for_guests_only)
|
||||
: fast_shutdown_started_(false),
|
||||
deleting_soon_(false),
|
||||
@@ -1275,7 +1273,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
@@ -1282,7 +1280,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
indexed_db_factory_(new IndexedDBDispatcherHost(
|
||||
id_,
|
||||
storage_partition_impl_->GetURLRequestContext(),
|
||||
@ -247,7 +276,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
ChromeBlobStorageContext::GetFor(browser_context_))),
|
||||
channel_connected_(false),
|
||||
sent_render_process_ready_(false),
|
||||
@@ -1309,7 +1308,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
@@ -1316,7 +1315,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
||||
}
|
||||
|
||||
push_messaging_manager_.reset(new PushMessagingManager(
|
||||
@ -256,17 +285,8 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
+ storage_partition_impl_->GetServiceWorkerContext())));
|
||||
|
||||
AddObserver(indexed_db_factory_.get());
|
||||
#if defined(OS_MACOSX)
|
||||
@@ -1520,7 +1520,7 @@ bool RenderProcessHostImpl::Init() {
|
||||
}
|
||||
|
||||
void RenderProcessHostImpl::EnableSendQueue() {
|
||||
- if (!channel_)
|
||||
+ if (!channel_ && browser_context_)
|
||||
InitializeChannelProxy();
|
||||
}
|
||||
|
||||
@@ -1617,6 +1617,22 @@ void RenderProcessHostImpl::ResetChannelProxy() {
|
||||
@@ -1620,6 +1620,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
|
||||
|
||||
void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@ -276,8 +296,6 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
+ storage_partition_impl_->GetAppCacheService());
|
||||
+ auto dom_storage_context = static_cast<DOMStorageContextWrapper*>(
|
||||
+ storage_partition_impl_->GetDOMStorageContext());
|
||||
+ auto indexed_db_context = static_cast<IndexedDBContextImpl*>(
|
||||
+ storage_partition_impl_->GetIndexedDBContext());
|
||||
+ auto cache_storage_context = static_cast<CacheStorageContextImpl*>(
|
||||
+ storage_partition_impl_->GetCacheStorageContext());
|
||||
+ auto service_worker_context = static_cast<ServiceWorkerContextWrapper*>(
|
||||
@ -289,7 +307,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
AddFilter(new ResourceSchedulerFilter(GetID()));
|
||||
MediaInternals* media_internals = MediaInternals::GetInstance();
|
||||
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
|
||||
@@ -1631,8 +1647,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -1634,8 +1648,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
new RenderMessageFilter(
|
||||
GetID(), GetBrowserContext(), request_context.get(),
|
||||
widget_helper_.get(), media_internals,
|
||||
@ -300,7 +318,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
AddFilter(render_message_filter.get());
|
||||
|
||||
render_frame_message_filter_ = new RenderFrameMessageFilter(
|
||||
@@ -1661,10 +1677,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -1664,10 +1678,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
ChromeBlobStorageContext::GetFor(browser_context);
|
||||
|
||||
resource_message_filter_ = new ResourceMessageFilter(
|
||||
@ -313,7 +331,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
|
||||
|
||||
AddFilter(resource_message_filter_.get());
|
||||
@@ -1691,10 +1707,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -1694,10 +1708,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
AddFilter(
|
||||
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
|
||||
AddFilter(new AppCacheDispatcherHost(
|
||||
@ -326,7 +344,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
|
||||
#if BUILDFLAG(ENABLE_WEBRTC)
|
||||
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(
|
||||
@@ -1731,13 +1747,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -1731,13 +1745,12 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
|
||||
scoped_refptr<CacheStorageDispatcherHost> cache_storage_filter =
|
||||
new CacheStorageDispatcherHost();
|
||||
@ -341,24 +359,8 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
+ service_worker_filter->Init(service_worker_context);
|
||||
AddFilter(service_worker_filter.get());
|
||||
|
||||
AddFilter(new SharedWorkerMessageFilter(
|
||||
@@ -1745,12 +1760,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()))));
|
||||
|
||||
@@ -1766,11 +1781,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
#if BUILDFLAG(ENABLE_WEBRTC)
|
||||
@@ -1752,11 +1765,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
GetID(), storage_partition_impl_->GetQuotaManager(),
|
||||
GetContentClient()->browser()->CreateQuotaPermissionContext()));
|
||||
|
||||
@ -371,7 +373,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
resource_context, service_worker_context, browser_context);
|
||||
AddFilter(notification_message_filter_.get());
|
||||
|
||||
@@ -1786,6 +1798,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
@@ -1771,6 +1781,11 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
||||
void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
auto registry = base::MakeUnique<service_manager::BinderRegistry>();
|
||||
|
||||
@ -383,7 +385,7 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
channel_->AddAssociatedInterfaceForIOThread(
|
||||
base::Bind(&IndexedDBDispatcherHost::AddBinding,
|
||||
base::Unretained(indexed_db_factory_.get())));
|
||||
@@ -1836,8 +1853,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
@@ -1825,8 +1840,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
||||
AddUIThreadInterface(
|
||||
registry.get(),
|
||||
base::Bind(&PlatformNotificationContextImpl::CreateService,
|
||||
@ -393,14 +395,6 @@ index 678135b37ee9..cdbdf8248453 100644
|
||||
GetID()));
|
||||
AddUIThreadInterface(
|
||||
registry.get(),
|
||||
@@ -2088,6 +2104,7 @@ void RenderProcessHostImpl::DisableKeepAliveRefCount() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK(!is_keep_alive_ref_count_disabled_);
|
||||
is_keep_alive_ref_count_disabled_ = true;
|
||||
+ browser_context_ = nullptr;
|
||||
if (!keep_alive_ref_count_)
|
||||
return;
|
||||
keep_alive_ref_count_ = 0;
|
||||
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
|
||||
index dd7df59cb5c4..3c802e969d80 100644
|
||||
--- content/browser/renderer_host/render_process_host_impl.h
|
||||
@ -454,10 +448,10 @@ index dd7df59cb5c4..3c802e969d80 100644
|
||||
// The observers watching our lifetime.
|
||||
base::ObserverList<RenderProcessHostObserver> observers_;
|
||||
diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
|
||||
index b5902ac7f70f..8592375cc0d6 100644
|
||||
index 6e62286f3f09..11a3cd5f07cb 100644
|
||||
--- content/browser/storage_partition_impl.h
|
||||
+++ content/browser/storage_partition_impl.h
|
||||
@@ -114,30 +114,30 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
@@ -117,32 +117,31 @@ class CONTENT_EXPORT StoragePartitionImpl
|
||||
const base::Closure& callback) override;
|
||||
void Flush() override;
|
||||
void ClearBluetoothAllowedDevicesMapForTesting() override;
|
||||
@ -492,14 +486,15 @@ index b5902ac7f70f..8592375cc0d6 100644
|
||||
- BrowserContext* browser_context() const;
|
||||
+ BrowserContext* browser_context() const override;
|
||||
|
||||
// Called by each renderer process once.
|
||||
void Bind(int process_id,
|
||||
- mojo::InterfaceRequest<mojom::StoragePartitionService> request);
|
||||
+ mojo::InterfaceRequest<mojom::StoragePartitionService> request)
|
||||
+ override;
|
||||
// Called by each renderer process once. Returns the id of the created
|
||||
// binding.
|
||||
mojo::BindingId Bind(
|
||||
int process_id,
|
||||
- mojo::InterfaceRequest<mojom::StoragePartitionService> request);
|
||||
+ mojo::InterfaceRequest<mojom::StoragePartitionService> request) override;
|
||||
|
||||
auto& bindings_for_testing() { return bindings_; }
|
||||
|
||||
struct DataDeletionHelper;
|
||||
struct QuotaManagedDataDeletionHelper;
|
||||
diff --git content/browser/streams/stream_context.cc content/browser/streams/stream_context.cc
|
||||
index b23d083c7342..49d52038a049 100644
|
||||
--- content/browser/streams/stream_context.cc
|
||||
@ -529,7 +524,7 @@ index 075ae3e7431e..57fb5fd2c4a8 100644
|
||||
|
||||
void InitializeOnIOThread();
|
||||
diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc
|
||||
index 3c49b85b0474..d15896854e9e 100644
|
||||
index 579df51d8083..09298a8d042a 100644
|
||||
--- content/browser/webui/web_ui_url_loader_factory.cc
|
||||
+++ content/browser/webui/web_ui_url_loader_factory.cc
|
||||
@@ -19,13 +19,13 @@
|
||||
@ -547,7 +542,7 @@ index 3c49b85b0474..d15896854e9e 100644
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/common/network_service.mojom.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
@@ -208,8 +208,8 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
|
||||
@@ -209,8 +209,8 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
|
||||
public:
|
||||
WebUIURLLoaderFactory(FrameTreeNode* ftn)
|
||||
: frame_tree_node_id_(ftn->frame_tree_node_id()),
|
||||
@ -558,7 +553,7 @@ index 3c49b85b0474..d15896854e9e 100644
|
||||
ftn->AddObserver(this);
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
|
||||
@@ -278,7 +278,7 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
|
||||
|
||||
private:
|
||||
int frame_tree_node_id_;
|
||||
@ -568,10 +563,10 @@ index 3c49b85b0474..d15896854e9e 100644
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(WebUIURLLoaderFactory);
|
||||
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
|
||||
index 486eee89ef60..ee0aa05c2215 100644
|
||||
index eff149812e0e..d0484fa48674 100644
|
||||
--- content/public/browser/browser_context.h
|
||||
+++ content/public/browser/browser_context.h
|
||||
@@ -188,6 +188,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
@@ -194,6 +194,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
|
||||
BrowserContext();
|
||||
|
||||
@ -580,7 +575,7 @@ index 486eee89ef60..ee0aa05c2215 100644
|
||||
~BrowserContext() override;
|
||||
|
||||
// Shuts down the storage partitions associated to this browser context.
|
||||
@@ -272,6 +274,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
@@ -282,6 +284,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
|
||||
const base::FilePath& partition_path,
|
||||
bool in_memory) = 0;
|
||||
|
||||
@ -596,7 +591,7 @@ index 486eee89ef60..ee0aa05c2215 100644
|
||||
std::map<std::string, service_manager::EmbeddedServiceInfo>;
|
||||
|
||||
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
|
||||
index cf270b894186..1f95c9c3b023 100644
|
||||
index c3c1aa9d5351..08555f42ac39 100644
|
||||
--- content/public/browser/storage_partition.h
|
||||
+++ content/public/browser/storage_partition.h
|
||||
@@ -13,6 +13,7 @@
|
||||
@ -628,8 +623,8 @@ index cf270b894186..1f95c9c3b023 100644
|
||||
|
||||
#if !defined(OS_ANDROID)
|
||||
class HostZoomLevelContext;
|
||||
@@ -58,6 +67,11 @@ namespace mojom {
|
||||
class NetworkContext;
|
||||
@@ -59,6 +68,11 @@ class NetworkContext;
|
||||
class URLLoaderFactory;
|
||||
}
|
||||
|
||||
+namespace mojom {
|
||||
@ -640,7 +635,7 @@ index cf270b894186..1f95c9c3b023 100644
|
||||
// Defines what persistent state a child process can access.
|
||||
//
|
||||
// The StoragePartition defines the view each child process has of the
|
||||
@@ -86,6 +100,13 @@ class CONTENT_EXPORT StoragePartition {
|
||||
@@ -91,6 +105,13 @@ class CONTENT_EXPORT StoragePartition {
|
||||
virtual ZoomLevelDelegate* GetZoomLevelDelegate() = 0;
|
||||
#endif // !defined(OS_ANDROID)
|
||||
virtual PlatformNotificationContext* GetPlatformNotificationContext() = 0;
|
||||
@ -654,7 +649,7 @@ index cf270b894186..1f95c9c3b023 100644
|
||||
|
||||
enum : uint32_t {
|
||||
REMOVE_DATA_MASK_APPCACHE = 1 << 0,
|
||||
@@ -191,6 +212,14 @@ class CONTENT_EXPORT StoragePartition {
|
||||
@@ -196,6 +217,14 @@ class CONTENT_EXPORT StoragePartition {
|
||||
// Clear the bluetooth allowed devices map. For test use only.
|
||||
virtual void ClearBluetoothAllowedDevicesMapForTesting() = 0;
|
||||
|
||||
@ -662,7 +657,7 @@ index cf270b894186..1f95c9c3b023 100644
|
||||
+ virtual BrowserContext* browser_context() const = 0;
|
||||
+
|
||||
+ // Called by each renderer process once.
|
||||
+ virtual void Bind(
|
||||
+ virtual mojo::BindingId Bind(
|
||||
+ int process_id,
|
||||
+ mojo::InterfaceRequest<mojom::StoragePartitionService> request) = 0;
|
||||
+
|
||||
|
Reference in New Issue
Block a user