bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 73.0.3665.0 (#620590)

Browse Source
This commit is contained in:
Alexander Guettler
2019-01-17 10:56:52 +01:00
committed by Marshall Greenblatt
parent 10916749d6
commit 1a86240c93
77 changed files with 685 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
patch/patches/storage_partition_1973.patch
View File

@@ -14,10 +14,10 @@ index 80198d013f0a..583edc8df4ed 100644
}
diff --git content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_impl.cc
index 96deec645d8f..82eea5b2c6e2 100644
index d56cc6909782..69c4e8c2877e 100644
--- content/browser/background_fetch/background_fetch_service_impl.cc
+++ content/browser/background_fetch/background_fetch_service_impl.cc
@@ -46,8 +46,7 @@ void BackgroundFetchServiceImpl::CreateForWorker(
@@ -47,8 +47,7 @@ void BackgroundFetchServiceImpl::CreateForWorker(
FROM_HERE, {BrowserThread::IO},
base::BindOnce(
BackgroundFetchServiceImpl::CreateOnIoThread,
@@ -25,9 +25,9 @@ index 96deec645d8f..82eea5b2c6e2 100644
- render_process_host->GetStoragePartition())
+ WrapRefCounted(render_process_host->GetStoragePartition()
->GetBackgroundFetchContext()),
origin, nullptr /* render_frame_host */, std::move(request)));
}
@@ -68,8 +67,7 @@ void BackgroundFetchServiceImpl::CreateForFrame(
origin, /* render_frame_tree_node_id= */ 0,
/* wc_getter= */ base::NullCallback(), std::move(request)));
@@ -79,8 +78,7 @@ void BackgroundFetchServiceImpl::CreateForFrame(
FROM_HERE, {BrowserThread::IO},
base::BindOnce(
BackgroundFetchServiceImpl::CreateOnIoThread,
@@ -35,8 +35,8 @@ index 96deec645d8f..82eea5b2c6e2 100644
- render_process_host->GetStoragePartition())
+ WrapRefCounted(render_process_host->GetStoragePartition()
->GetBackgroundFetchContext()),
render_frame_host->GetLastCommittedOrigin(), render_frame_host,
std::move(request)));
render_frame_host->GetLastCommittedOrigin(),
render_frame_host->GetFrameTreeNodeId(), std::move(wc_getter),
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 31bad2ca4cc8..1f8c2c00e427 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -67,10 +67,10 @@ index 26cf1ebfdffc..f6de541d25d1 100644
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 f061eca7c86b..0fc07c9c4eb8 100644
index 771083c375b8..b04254cb727c 100644
--- content/browser/bluetooth/web_bluetooth_service_impl.cc
+++ content/browser/bluetooth/web_bluetooth_service_impl.cc
@@ -1233,9 +1233,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
@@ -1391,9 +1391,9 @@ url::Origin WebBluetoothServiceImpl::GetOrigin() {
}
BluetoothAllowedDevices& WebBluetoothServiceImpl::allowed_devices() {
@@ -83,10 +83,10 @@ index f061eca7c86b..0fc07c9c4eb8 100644
partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index f37ebdb29896..03448e9fcec0 100644
index 617683c9e47e..9ad01edc2ea7 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -208,11 +208,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -257,11 +257,18 @@ StoragePartition* GetStoragePartitionFromConfig(
StoragePartitionImplMap* partition_map =
GetStoragePartitionMap(browser_context);
@@ -108,7 +108,7 @@ index f37ebdb29896..03448e9fcec0 100644
}
void SaveSessionStateOnIOThread(
@@ -746,6 +753,11 @@ BrowserContext::BrowserContext()
@@ -821,6 +828,11 @@ BrowserContext::BrowserContext()
new SharedCorsOriginAccessListImpl()));
}
@@ -121,7 +121,7 @@ index f37ebdb29896..03448e9fcec0 100644
CHECK(GetUserData(kServiceInstanceGroup))
<< "Attempting to destroy a BrowserContext that never called "
diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc
index 492f013e7c20..e84b6cd4c4aa 100644
index 714a1b956c09..990f038d47d9 100644
--- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc
@@ -805,8 +805,7 @@ class BackgroundSyncRestorer {
@@ -171,7 +171,7 @@ index ec9ab86d0ca6..0fe5219f1e84 100644
base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
index a2d4e5187819..c61088e48747 100644
index 644ddcb990e5..7cb7b03f1fcd 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) {
@@ -197,7 +197,7 @@ index a2d4e5187819..c61088e48747 100644
}
void OnDownloadStarted(
@@ -268,7 +267,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
@@ -270,7 +269,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@@ -206,7 +206,7 @@ index a2d4e5187819..c61088e48747 100644
RenderFrameHost* rfh,
bool is_download) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -285,7 +284,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
@@ -287,7 +286,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@@ -215,7 +215,7 @@ index a2d4e5187819..c61088e48747 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -1196,7 +1195,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1203,7 +1202,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@@ -224,7 +224,7 @@ index a2d4e5187819..c61088e48747 100644
GetStoragePartition(browser_context_, render_process_id, render_frame_id);
in_progress_manager_->InterceptDownloadFromNavigation(
std::move(resource_request), render_process_id, render_frame_id, site_url,
@@ -1246,10 +1245,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
@@ -1254,10 +1253,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>(
rfh, params->url());
} else if (rfh && params->url().SchemeIsFileSystem()) {
@@ -237,7 +237,7 @@ index a2d4e5187819..c61088e48747 100644
std::string storage_domain;
auto* site_instance = rfh->GetSiteInstance();
if (site_instance) {
@@ -1264,10 +1261,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
@@ -1272,10 +1269,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
params->url(), rfh, /*is_navigation=*/false,
storage_partition->GetFileSystemContext(), storage_domain);
} else {
@@ -251,10 +251,10 @@ index a2d4e5187819..c61088e48747 100644
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
}
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 686e303e0230..e458b78fdf7a 100644
index e399585bcab0..ba922d93d58e 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -376,7 +376,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory {
@@ -387,7 +387,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory {
std::unique_ptr<network::SharedURLLoaderFactoryInfo>
CreateNetworkFactoryInfoWithHeaderClient(
network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client,
@@ -263,7 +263,7 @@ index 686e303e0230..e458b78fdf7a 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
network::mojom::URLLoaderFactoryPtrInfo factory_info;
network::mojom::URLLoaderFactoryParamsPtr params =
@@ -1239,7 +1239,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -1257,7 +1257,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
// path does as well for navigations.
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@@ -328,10 +328,10 @@ index d821dc59609c..58ff1bc59fed 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index d1823ebdeee9..4c80df77e27f 100644
index aac3f0505472..0ffa78434737 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -749,11 +749,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -747,11 +747,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) {
@@ -347,7 +347,7 @@ index d1823ebdeee9..4c80df77e27f 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1499,7 +1498,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1505,7 +1504,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -356,7 +356,7 @@ index d1823ebdeee9..4c80df77e27f 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1508,8 +1507,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1514,8 +1513,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@@ -367,7 +367,7 @@ index d1823ebdeee9..4c80df77e27f 100644
}
// If we've made a StoragePartition for guests (e.g., for the <webview> tag),
// stash the Site URL on it. This way, when we start a service worker inside
@@ -1534,7 +1533,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1540,7 +1539,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -376,7 +376,7 @@ index d1823ebdeee9..4c80df77e27f 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1585,10 +1584,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1591,10 +1590,12 @@ RenderProcessHostImpl::RenderProcessHostImpl(
permission_service_context_(new PermissionServiceContext(this)),
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
@@ -391,7 +391,7 @@ index d1823ebdeee9..4c80df77e27f 100644
id_)),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1621,7 +1622,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1628,7 +1629,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@@ -401,7 +401,7 @@ index d1823ebdeee9..4c80df77e27f 100644
AddObserver(indexed_db_factory_.get());
AddObserver(service_worker_dispatcher_host_.get());
@@ -1950,6 +1952,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1953,6 +1955,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -417,7 +417,7 @@ index d1823ebdeee9..4c80df77e27f 100644
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
// from guests.
@@ -1989,10 +2000,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1992,10 +2003,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
media_request_context));
resource_message_filter_ = new ResourceMessageFilter(
@@ -430,7 +430,7 @@ index d1823ebdeee9..4c80df77e27f 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
BrowserContext::GetSharedCorsOriginAccessList(browser_context),
std::move(get_contexts_callback),
@@ -2001,8 +2012,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -2004,8 +2015,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(resource_message_filter_.get());
}
@@ -440,7 +440,7 @@ index d1823ebdeee9..4c80df77e27f 100644
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
AddFilter(peer_connection_tracker_host_.get());
@@ -2019,10 +2029,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -2022,10 +2032,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(GetID()));
@@ -451,7 +451,7 @@ index d1823ebdeee9..4c80df77e27f 100644
}
void RenderProcessHostImpl::BindCacheStorage(
@@ -2034,7 +2040,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -2037,7 +2043,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@@ -461,7 +461,7 @@ index d1823ebdeee9..4c80df77e27f 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2218,7 +2225,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2231,7 +2238,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&CodeCacheHostImpl::Create, GetID(),
@@ -471,7 +471,7 @@ index d1823ebdeee9..4c80df77e27f 100644
base::RetainedRef(
storage_partition_impl_->GetGeneratedCodeCacheContext())));
@@ -2230,7 +2238,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2243,7 +2251,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@@ -481,7 +481,7 @@ index d1823ebdeee9..4c80df77e27f 100644
GetID()));
AddUIThreadInterface(
@@ -2283,6 +2292,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2288,6 +2297,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
plugin_registry_.reset(
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
}
@@ -492,10 +492,10 @@ index d1823ebdeee9..4c80df77e27f 100644
&PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get())));
#endif
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 8b2915483c25..86ba4fab4ee5 100644
index efaf56d47ec6..1be61f1467af 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -98,7 +98,6 @@ class ServiceWorkerDispatcherHost;
@@ -99,7 +99,6 @@ class ServiceWorkerDispatcherHost;
class SiteInstance;
class SiteInstanceImpl;
class StoragePartition;
@@ -503,7 +503,7 @@ index 8b2915483c25..86ba4fab4ee5 100644
struct ChildProcessTerminationInfo;
typedef base::Thread* (*RendererMainThreadFactoryFunction)(
@@ -140,7 +139,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -141,7 +140,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// null.
static RenderProcessHost* CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -512,7 +512,7 @@ index 8b2915483c25..86ba4fab4ee5 100644
SiteInstance* site_instance,
bool is_for_guests_only);
@@ -491,7 +490,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -495,7 +494,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor
// directly.
RenderProcessHostImpl(BrowserContext* browser_context,
@@ -521,7 +521,7 @@ index 8b2915483c25..86ba4fab4ee5 100644
bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -746,10 +745,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -759,10 +758,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// The globally-unique identifier for this RPH.
const int id_;
@@ -535,7 +535,7 @@ index 8b2915483c25..86ba4fab4ee5 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver>::Unchecked observers_;
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
index 5a6e7ed16110..d20a8e216f57 100644
index 87ecafbac4bd..ea76b7e8c6cb 100644
--- content/browser/renderer_interface_binders.cc
+++ content/browser/renderer_interface_binders.cc
@@ -140,7 +140,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -547,7 +547,7 @@ index 5a6e7ed16110..d20a8e216f57 100644
->GetPaymentAppContext()
->CreatePaymentManager(std::move(request));
}));
@@ -167,15 +167,16 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -173,15 +173,16 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@@ -567,7 +567,7 @@ index 5a6e7ed16110..d20a8e216f57 100644
->CreateService(origin, std::move(request));
}));
parameterized_binder_registry_.AddInterface(
@@ -187,7 +188,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -193,7 +194,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::CookieStoreRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@@ -711,7 +711,7 @@ index 63fe0125ca1c..698378600723 100644
RenderFrameHost* render_frame_host_;
diff --git content/browser/worker_host/shared_worker_connector_impl.cc content/browser/worker_host/shared_worker_connector_impl.cc
index 69e9a943310b..fabdba322870 100644
index 9ec4836022bb..57a6480bfd95 100644
--- content/browser/worker_host/shared_worker_connector_impl.cc
+++ content/browser/worker_host/shared_worker_connector_impl.cc
@@ -52,8 +52,8 @@ void SharedWorkerConnectorImpl::Connect(
@@ -726,10 +726,10 @@ index 69e9a943310b..fabdba322870 100644
std::move(client), creation_context_type,
blink::MessagePortChannel(std::move(message_port)),
diff --git content/browser/worker_host/worker_script_fetch_initiator.cc content/browser/worker_host/worker_script_fetch_initiator.cc
index cf47bcfcecb0..a22dc17ed0c6 100644
index 2f4be80c04e8..6d77a31c4077 100644
--- content/browser/worker_host/worker_script_fetch_initiator.cc
+++ content/browser/worker_host/worker_script_fetch_initiator.cc
@@ -97,7 +97,7 @@ void WorkerScriptFetchInitiator::Start(
@@ -98,7 +98,7 @@ void WorkerScriptFetchInitiator::Start(
base::BindOnce(
&WorkerScriptFetchInitiator::CreateScriptLoaderOnIO, process_id,
std::move(resource_request),
@@ -739,7 +739,7 @@ index cf47bcfcecb0..a22dc17ed0c6 100644
std::move(subresource_loader_factories),
std::move(service_worker_context), appcache_handle_core,
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index b6181e5c68a8..2c77bc6cbd18 100644
index 9f562fd96d48..a97e9113c6c0 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -242,6 +242,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -751,9 +751,9 @@ index b6181e5c68a8..2c77bc6cbd18 100644
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -333,6 +335,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;
@@ -362,6 +364,13 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
virtual download::InProgressDownloadManager*
RetriveInProgressDownloadManager();
+ // CEF returns a proxy object that forwards method calls to |partition_impl|.
+ virtual content::StoragePartition* GetStoragePartitionProxy(
@@ -762,12 +762,11 @@ index b6181e5c68a8..2c77bc6cbd18 100644
+ NOTREACHED();
+ return nullptr;
+ }
+
using StaticServiceMap =
std::map<std::string, service_manager::EmbeddedServiceInfo>;
private:
const std::string unique_id_;
bool was_notify_will_be_destroyed_called_ = false;
diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
index 713e4ae698c7..6a75d629e268 100644
index 6fe4d0bd6cdd..a7ea20c6f12a 100644
--- content/public/browser/storage_partition.h
+++ content/public/browser/storage_partition.h
@@ -14,8 +14,10 @@
@@ -810,7 +809,7 @@ index 713e4ae698c7..6a75d629e268 100644
// Defines what persistent state a child process can access.
//
// The StoragePartition defines the view each child process has of the
@@ -102,6 +120,7 @@ class CONTENT_EXPORT StoragePartition {
@@ -104,6 +122,7 @@ class CONTENT_EXPORT StoragePartition {
virtual storage::FileSystemContext* GetFileSystemContext() = 0;
virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
virtual DOMStorageContext* GetDOMStorageContext() = 0;
@@ -818,7 +817,7 @@ index 713e4ae698c7..6a75d629e268 100644
virtual IndexedDBContext* GetIndexedDBContext() = 0;
virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
virtual SharedWorkerService* GetSharedWorkerService() = 0;
@@ -232,6 +251,26 @@ class CONTENT_EXPORT StoragePartition {
@@ -234,6 +253,26 @@ class CONTENT_EXPORT StoragePartition {
// Wait until all deletions tasks are finished. For test use only.
virtual void WaitForDeletionTasksForTesting() = 0;