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 68.0.3416.0 (#554961)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-05-18 13:45:18 +03:00
parent 240ba800ed
commit a9f0fa9dfe
41 changed files with 322 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
patch/patches/storage_partition_1973.patch
View File

@@ -28,7 +28,7 @@ index 596cfaa01092..f341bca174d5 100644
origin, std::move(request)));
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 0b5780dfe117..a499aaacb879 100644
index 89f917826da1..d102ad69f084 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -87,6 +87,11 @@ class BlobHandleImpl : public BlobHandle {
@@ -44,10 +44,10 @@ index 0b5780dfe117..a499aaacb879 100644
BrowserContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
index 043d968ca6ab..edb3c0d80c12 100644
index 812a6a5cebe8..e6ee7ffbba79 100644
--- content/browser/blob_storage/chrome_blob_storage_context.h
+++ content/browser/blob_storage/chrome_blob_storage_context.h
@@ -52,6 +52,8 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -50,6 +50,8 @@ class CONTENT_EXPORT ChromeBlobStorageContext
public:
ChromeBlobStorageContext();
@@ -73,7 +73,7 @@ index cda94e43e866..84fde20fdce2 100644
partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index bb3d7a1f7b65..a44b32c618c0 100644
index af7cced24feb..6a228c204912 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -131,11 +131,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -98,7 +98,7 @@ index bb3d7a1f7b65..a44b32c618c0 100644
}
void SaveSessionStateOnIOThread(
@@ -586,6 +593,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
@@ -566,6 +573,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
BrowserContext::BrowserContext()
: unique_id_(base::UnguessableToken::Create().ToString()) {}
@@ -111,7 +111,7 @@ index bb3d7a1f7b65..a44b32c618c0 100644
CHECK(GetUserData(kMojoWasInitialized))
<< "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 a438c95df957..b80ea1582ec3 100644
index 4fa1766cf313..7f539e1e83a3 100644
--- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc
@@ -889,8 +889,7 @@ class BackgroundSyncRestorer {
@@ -161,10 +161,10 @@ 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 73135a675b85..4e1b9854ad9d 100644
index 591f60dc8f96..ad90a2648e23 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -84,9 +84,9 @@
@@ -85,9 +85,9 @@
namespace content {
namespace {
@@ -177,7 +177,7 @@ index 73135a675b85..4e1b9854ad9d 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
SiteInstance* site_instance = nullptr;
@@ -96,8 +96,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
@@ -97,8 +97,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
if (render_frame_host_)
site_instance = render_frame_host_->GetSiteInstance();
}
@@ -187,7 +187,7 @@ index 73135a675b85..4e1b9854ad9d 100644
}
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
@@ -250,7 +249,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
@@ -251,7 +250,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@@ -196,7 +196,7 @@ index 73135a675b85..4e1b9854ad9d 100644
RenderFrameHost* rfh,
bool has_suggested_filename) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -267,7 +266,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
@@ -268,7 +267,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@@ -205,7 +205,7 @@ index 73135a675b85..4e1b9854ad9d 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -597,8 +596,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
@@ -598,8 +597,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
std::unique_ptr<download::DownloadUrlParameters> params,
uint32_t id,
const GURL& site_url) {
@@ -215,8 +215,8 @@ index 73135a675b85..4e1b9854ad9d 100644
+ BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
params->set_url_request_context_getter(
storage_partition->GetURLRequestContext());
BeginDownloadInternal(std::move(params), nullptr, id, storage_partition);
@@ -784,7 +783,7 @@ void DownloadManagerImpl::DownloadUrl(
BeginDownloadInternal(std::move(params), nullptr /* blob_data_handle */,
@@ -789,7 +788,7 @@ void DownloadManagerImpl::DownloadUrl(
download::RecordDownloadCountWithSource(
download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
params->download_source());
@@ -225,7 +225,7 @@ index 73135a675b85..4e1b9854ad9d 100644
GetStoragePartition(browser_context_, params->render_process_host_id(),
params->render_frame_host_routing_id());
BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
@@ -1002,7 +1001,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1008,7 +1007,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@@ -234,9 +234,9 @@ index 73135a675b85..4e1b9854ad9d 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,
@@ -1017,7 +1016,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
std::unique_ptr<download::DownloadUrlParameters> params,
@@ -1024,7 +1023,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
uint32_t id,
- StoragePartitionImpl* storage_partition) {
+ StoragePartition* storage_partition) {
@@ -244,7 +244,7 @@ index 73135a675b85..4e1b9854ad9d 100644
if (params->render_process_host_id() >= 0 &&
!CanRequestURLFromRenderer(params->render_process_host_id(),
diff --git content/browser/download/download_manager_impl.h content/browser/download/download_manager_impl.h
index e7aa6cefb35c..42c2090ca161 100644
index f79ea7165dfd..35b545213c31 100644
--- content/browser/download/download_manager_impl.h
+++ content/browser/download/download_manager_impl.h
@@ -42,7 +42,7 @@ class DownloadRequestHandleInterface;
@@ -256,9 +256,9 @@ index e7aa6cefb35c..42c2090ca161 100644
class CONTENT_EXPORT DownloadManagerImpl
: public DownloadManager,
@@ -246,7 +246,7 @@ class CONTENT_EXPORT DownloadManagerImpl
std::unique_ptr<download::DownloadUrlParameters> params,
@@ -248,7 +248,7 @@ class CONTENT_EXPORT DownloadManagerImpl
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
uint32_t id,
- StoragePartitionImpl* storage_partition);
+ StoragePartition* storage_partition);
@@ -266,10 +266,10 @@ index e7aa6cefb35c..42c2090ca161 100644
void InterceptNavigationOnChecksComplete(
ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
index b4c1232ea111..f44572270b83 100644
index 955cb24e64d1..1c2abdf645dc 100644
--- content/browser/loader/navigation_url_loader_network_service.cc
+++ content/browser/loader/navigation_url_loader_network_service.cc
@@ -893,7 +893,7 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController
@@ -892,7 +892,7 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController
// path does as well for navigations.
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@@ -278,7 +278,7 @@ index b4c1232ea111..f44572270b83 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1260,7 +1260,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1259,7 +1259,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
}
}
@@ -287,7 +287,7 @@ index b4c1232ea111..f44572270b83 100644
non_network_url_loader_factories_[url::kFileScheme] =
std::make_unique<FileURLLoaderFactory>(
partition->browser_context()->GetPath(),
@@ -1274,7 +1274,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1273,7 +1273,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
DCHECK(!request_controller_);
request_controller_ = std::make_unique<URLLoaderRequestController>(
std::move(initial_interceptors), std::move(new_request), resource_context,
@@ -314,10 +314,10 @@ index 6a6e31bdb070..dce0433e1775 100644
partition->GetPaymentAppContext();
diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
index 5d4aefd16449..b5f99bc43389 100644
index dd0af046aec4..f5ad5b37c1f3 100644
--- content/browser/payments/payment_app_provider_impl.cc
+++ content/browser/payments/payment_app_provider_impl.cc
@@ -307,10 +307,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
@@ -371,10 +371,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
ServiceWorkerStartCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -332,7 +332,7 @@ index 5d4aefd16449..b5f99bc43389 100644
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -377,8 +378,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -451,8 +452,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
GetAllPaymentAppsCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -344,10 +344,10 @@ index 5d4aefd16449..b5f99bc43389 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index a0162dcd2946..eef13b5035e9 100644
index 20994fc0a49c..f2f79f299d20 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -734,11 +734,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -732,11 +732,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) {
@@ -363,7 +363,7 @@ index a0162dcd2946..eef13b5035e9 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1351,7 +1350,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1349,7 +1348,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@@ -372,7 +372,7 @@ index a0162dcd2946..eef13b5035e9 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1360,8 +1359,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1358,8 +1357,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@@ -383,7 +383,7 @@ index a0162dcd2946..eef13b5035e9 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
@@ -1386,7 +1385,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1384,7 +1383,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -392,7 +392,7 @@ index a0162dcd2946..eef13b5035e9 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1419,7 +1418,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1417,7 +1416,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@@ -402,7 +402,7 @@ index a0162dcd2946..eef13b5035e9 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1454,7 +1454,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1452,7 +1452,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@@ -412,7 +412,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX)
@@ -1782,6 +1783,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1780,6 +1781,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -433,7 +433,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1795,8 +1810,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1793,8 +1808,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@@ -444,7 +444,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1823,10 +1838,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1821,10 +1836,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@@ -457,7 +457,7 @@ index a0162dcd2946..eef13b5035e9 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1835,8 +1850,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1833,8 +1848,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -467,7 +467,7 @@ index a0162dcd2946..eef13b5035e9 100644
#if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
@@ -1858,8 +1872,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1854,8 +1868,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
new ServiceWorkerDispatcherHost(GetID(), resource_context);
@@ -477,7 +477,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(service_worker_filter.get());
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -1871,11 +1884,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1867,11 +1880,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@@ -490,7 +490,7 @@ index a0162dcd2946..eef13b5035e9 100644
resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get());
}
@@ -1889,7 +1899,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1885,7 +1895,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@@ -500,7 +500,7 @@ index a0162dcd2946..eef13b5035e9 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2022,7 +2033,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2018,7 +2029,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@@ -511,7 +511,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 4a9513bfa37c..23639d2bbf2b 100644
index e709fd121d7c..b67e0d854e07 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -88,7 +88,6 @@ class ResourceMessageFilter;
@@ -531,7 +531,7 @@ index 4a9513bfa37c..23639d2bbf2b 100644
SiteInstance* site_instance,
bool is_for_guests_only);
@@ -446,7 +445,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -445,7 +444,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor
// directly.
RenderProcessHostImpl(BrowserContext* browser_context,
@@ -540,7 +540,7 @@ index 4a9513bfa37c..23639d2bbf2b 100644
bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -717,10 +716,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -716,10 +715,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;
@@ -554,10 +554,10 @@ index 4a9513bfa37c..23639d2bbf2b 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
index 81e1e824d0f2..4a1c11c597d9 100644
index 74a060efdc5c..548feab31a42 100644
--- content/browser/renderer_interface_binders.cc
+++ content/browser/renderer_interface_binders.cc
@@ -135,7 +135,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -143,7 +143,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind([](payments::mojom::PaymentManagerRequest request,
RenderProcessHost* host, const url::Origin& origin) {
@@ -566,7 +566,7 @@ index 81e1e824d0f2..4a1c11c597d9 100644
->GetPaymentAppContext()
->CreatePaymentManager(std::move(request));
}));
@@ -155,7 +155,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -163,16 +163,17 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@@ -575,7 +575,6 @@ index 81e1e824d0f2..4a1c11c597d9 100644
->GetLockManager()
->CreateService(std::move(request), origin);
}));
@@ -164,9 +164,10 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind([](blink::mojom::NotificationServiceRequest request,
RenderProcessHost* host, const url::Origin& origin) {
@@ -721,10 +720,10 @@ 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 fb7a2fe41f94..f8232c08e924 100644
index 187bde2d1cca..b86e9c943f01 100644
--- content/browser/webui/web_ui_url_loader_factory.cc
+++ content/browser/webui/web_ui_url_loader_factory.cc
@@ -19,13 +19,13 @@
@@ -20,13 +20,13 @@
#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"
@@ -739,7 +738,7 @@ index fb7a2fe41f94..f8232c08e924 100644
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/url_constants.h"
@@ -313,9 +313,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
@@ -319,9 +319,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
const std::string& scheme() const { return scheme_; }
private:
@@ -752,10 +751,10 @@ index fb7a2fe41f94..f8232c08e924 100644
RenderFrameHost* render_frame_host_;
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 4df248003ecb..395c670dbd1e 100644
index dffff04f6f86..29a0653b8fa5 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -206,6 +206,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -197,6 +197,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext();
@@ -764,7 +763,7 @@ index 4df248003ecb..395c670dbd1e 100644
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -294,6 +296,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -285,6 +287,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;