Update to Chromium version 68.0.3403.0 (#552595)

patch/patches/storage_partition_1973.patch

@@ -111,7 +111,7 @@ index 15cb62d76bb0..4de29a1f11f9 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 9066c881f6c7..804aaa98abe2 100644
+index 91a8bc378f3a..81b5b821b20c 100644
 --- content/browser/devtools/protocol/network_handler.cc
 +++ content/browser/devtools/protocol/network_handler.cc
 @@ -887,8 +887,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 c40582647347..6cb7dcd47392 100644
+index 88e9a45130c4..6fec44266f2c 100644
 --- content/browser/download/download_manager_impl.cc
 +++ content/browser/download/download_manager_impl.cc
-@@ -86,9 +86,9 @@
+@@ -87,9 +87,9 @@
  namespace content {
  namespace {
  
@@ -177,7 +177,7 @@ index c40582647347..6cb7dcd47392 100644
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  
    SiteInstance* site_instance = nullptr;
-@@ -98,8 +98,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
+@@ -99,8 +99,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
      if (render_frame_host_)
        site_instance = render_frame_host_->GetSiteInstance();
    }
@@ -187,7 +187,25 @@ index c40582647347..6cb7dcd47392 100644
  }
  
  bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
-@@ -816,8 +815,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
+@@ -276,7 +275,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
+ #endif
+ 
+ scoped_refptr<download::DownloadURLLoaderFactoryGetter>
+-CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
++CreateDownloadURLLoaderFactoryGetter(StoragePartition* storage_partition,
+                                      RenderFrameHost* rfh,
+                                      bool has_suggested_filename) {
+   network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
+@@ -293,7 +292,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
+     }
+   }
+   return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
+-      storage_partition->url_loader_factory_getter(),
++      base::WrapRefCounted(storage_partition->url_loader_factory_getter()),
+       std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
+ }
+ 
+@@ -811,8 +810,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
      std::unique_ptr<download::DownloadUrlParameters> params,
      uint32_t id,
      const GURL& site_url) {
@@ -198,7 +216,7 @@ index c40582647347..6cb7dcd47392 100644
    params->set_url_request_context_getter(
        storage_partition->GetURLRequestContext());
    BeginDownloadInternal(std::move(params), nullptr, id, storage_partition);
-@@ -1019,7 +1018,7 @@ void DownloadManagerImpl::DownloadUrl(
+@@ -1014,7 +1013,7 @@ void DownloadManagerImpl::DownloadUrl(
    download::RecordDownloadCountWithSource(
        download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
        params->download_source());
@@ -207,16 +225,16 @@ index c40582647347..6cb7dcd47392 100644
        GetStoragePartition(browser_context_, params->render_process_host_id(),
                            params->render_frame_host_routing_id());
    BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
-@@ -1236,7 +1235,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
+@@ -1232,7 +1231,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
        tab_referrer_url = entry->GetReferrer().url;
      }
    }
 -  StoragePartitionImpl* storage_partition =
 +  StoragePartition* storage_partition =
        GetStoragePartition(browser_context_, render_process_id, render_frame_id);
-   BrowserThread::PostTask(
-       BrowserThread::IO, FROM_HERE,
-@@ -1291,7 +1290,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
+   in_progress_manager_->InterceptDownloadFromNavigation(
+       std::move(resource_request), render_process_id, render_frame_id, site_url,
+@@ -1247,7 +1246,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
      std::unique_ptr<download::DownloadUrlParameters> params,
      std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
      uint32_t id,
@@ -226,10 +244,10 @@ index c40582647347..6cb7dcd47392 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 a13ab73e18e5..ef129440d3bf 100644
+index a35035ea0b4f..5fbcbb5dc937 100644
 --- content/browser/download/download_manager_impl.h
 +++ content/browser/download/download_manager_impl.h
-@@ -41,7 +41,7 @@ class DownloadRequestHandleInterface;
+@@ -42,7 +42,7 @@ class InProgressDownloadManager;
  
  namespace content {
  class ResourceContext;
@@ -248,10 +266,10 @@ index a13ab73e18e5..ef129440d3bf 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 4b7db1b992e4..7befff0086b1 100644
+index 2713461dc3ed..7bc6ffa12a97 100644
 --- content/browser/loader/navigation_url_loader_network_service.cc
 +++ content/browser/loader/navigation_url_loader_network_service.cc
-@@ -1231,7 +1231,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
+@@ -1196,7 +1196,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
      }
    }
  
@@ -260,7 +278,7 @@ index 4b7db1b992e4..7befff0086b1 100644
    non_network_url_loader_factories_[url::kFileScheme] =
        std::make_unique<FileURLLoaderFactory>(
            partition->browser_context()->GetPath(),
-@@ -1245,7 +1245,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
+@@ -1210,7 +1210,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
    DCHECK(!request_controller_);
    request_controller_ = std::make_unique<URLLoaderRequestController>(
        std::move(initial_interceptors), std::move(new_request), resource_context,
@@ -317,10 +335,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 fa71b597f04c..129ad22146c0 100644
+index 5fb571a47382..db6d16b1beaf 100644
 --- content/browser/renderer_host/render_process_host_impl.cc
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -736,11 +736,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
+@@ -735,11 +735,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) {
@@ -336,7 +354,7 @@ index fa71b597f04c..129ad22146c0 100644
  
      // Is this the default storage partition? If it isn't, then just give it its
      // own non-shared process.
-@@ -1353,7 +1352,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
+@@ -1352,7 +1351,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
  // static
  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
      BrowserContext* browser_context,
@@ -345,7 +363,7 @@ index fa71b597f04c..129ad22146c0 100644
      SiteInstance* site_instance,
      bool is_for_guests_only) {
    if (g_render_process_host_factory_) {
-@@ -1362,8 +1361,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
+@@ -1361,8 +1360,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
    }
  
    if (!storage_partition_impl) {
@@ -356,7 +374,7 @@ index fa71b597f04c..129ad22146c0 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
-@@ -1388,7 +1387,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
+@@ -1387,7 +1386,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
  
  RenderProcessHostImpl::RenderProcessHostImpl(
      BrowserContext* browser_context,
@@ -365,7 +383,7 @@ index fa71b597f04c..129ad22146c0 100644
      bool is_for_guests_only)
      : fast_shutdown_started_(false),
        deleting_soon_(false),
-@@ -1421,7 +1420,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1420,7 +1419,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
        indexed_db_factory_(new IndexedDBDispatcherHost(
            id_,
            storage_partition_impl_->GetURLRequestContext(),
@@ -375,7 +393,7 @@ index fa71b597f04c..129ad22146c0 100644
            ChromeBlobStorageContext::GetFor(browser_context_))),
        channel_connected_(false),
        sent_render_process_ready_(false),
-@@ -1458,7 +1458,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
+@@ -1455,7 +1455,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
    }
  
    push_messaging_manager_.reset(new PushMessagingManager(
@@ -385,7 +403,7 @@ index fa71b597f04c..129ad22146c0 100644
  
    AddObserver(indexed_db_factory_.get());
  #if defined(OS_MACOSX)
-@@ -1786,6 +1787,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
+@@ -1783,6 +1784,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
  
  void RenderProcessHostImpl::CreateMessageFilters() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -406,7 +424,7 @@ index fa71b597f04c..129ad22146c0 100644
    AddFilter(new ResourceSchedulerFilter(GetID()));
    MediaInternals* media_internals = MediaInternals::GetInstance();
    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
-@@ -1800,8 +1815,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1797,8 +1812,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        new RenderMessageFilter(
            GetID(), GetBrowserContext(), request_context.get(),
            widget_helper_.get(), media_internals,
@@ -417,7 +435,7 @@ index fa71b597f04c..129ad22146c0 100644
    AddFilter(render_message_filter.get());
  
    render_frame_message_filter_ = new RenderFrameMessageFilter(
-@@ -1828,10 +1843,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1825,10 +1840,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
        ChromeBlobStorageContext::GetFor(browser_context);
  
    resource_message_filter_ = new ResourceMessageFilter(
@@ -430,7 +448,7 @@ index fa71b597f04c..129ad22146c0 100644
        storage_partition_impl_->GetPrefetchURLLoaderService(),
        std::move(get_contexts_callback),
        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
-@@ -1840,8 +1855,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1837,8 +1852,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    AddFilter(
        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@@ -440,7 +458,7 @@ index fa71b597f04c..129ad22146c0 100644
  
  #if BUILDFLAG(ENABLE_WEBRTC)
    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
-@@ -1863,8 +1877,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1860,8 +1874,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
  
    scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
        new ServiceWorkerDispatcherHost(GetID(), resource_context);
@@ -450,7 +468,7 @@ index fa71b597f04c..129ad22146c0 100644
    AddFilter(service_worker_filter.get());
  
  #if BUILDFLAG(ENABLE_WEBRTC)
-@@ -1876,11 +1889,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
+@@ -1873,11 +1886,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
    AddFilter(new TraceMessageFilter(GetID()));
    AddFilter(new ResolveProxyMsgHelper(request_context.get()));
  
@@ -463,7 +481,7 @@ index fa71b597f04c..129ad22146c0 100644
        resource_context, service_worker_context, browser_context);
    AddFilter(notification_message_filter_.get());
  }
-@@ -1894,7 +1904,8 @@ void RenderProcessHostImpl::BindCacheStorage(
+@@ -1891,7 +1901,8 @@ void RenderProcessHostImpl::BindCacheStorage(
      cache_storage_dispatcher_host_ =
          base::MakeRefCounted<CacheStorageDispatcherHost>();
      cache_storage_dispatcher_host_->Init(
@@ -473,7 +491,7 @@ index fa71b597f04c..129ad22146c0 100644
    }
    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
    // thread entirely.
-@@ -2032,7 +2043,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
+@@ -2024,7 +2035,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
  
    registry->AddInterface(base::BindRepeating(
        &AppCacheDispatcherHost::Create,
@@ -484,10 +502,10 @@ index fa71b597f04c..129ad22146c0 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 145a2e9d821b..e53c18722d4a 100644
+index 0ea859f1c52a..c80e3a5403b7 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;
+@@ -87,7 +87,6 @@ class ResourceMessageFilter;
  class SiteInstance;
  class SiteInstanceImpl;
  class StoragePartition;
@@ -495,7 +513,7 @@ index 145a2e9d821b..e53c18722d4a 100644
  
  #if BUILDFLAG(ENABLE_WEBRTC)
  class MediaStreamTrackMetricsHost;
-@@ -135,7 +134,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -134,7 +133,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // null.
    static RenderProcessHost* CreateRenderProcessHost(
        BrowserContext* browser_context,
@@ -504,7 +522,7 @@ index 145a2e9d821b..e53c18722d4a 100644
        SiteInstance* site_instance,
        bool is_for_guests_only);
  
-@@ -440,7 +439,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -441,7 +440,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Use CreateRenderProcessHost() instead of calling this constructor
    // directly.
    RenderProcessHostImpl(BrowserContext* browser_context,
@@ -513,7 +531,7 @@ index 145a2e9d821b..e53c18722d4a 100644
                          bool is_for_guests_only);
  
    // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
-@@ -709,10 +708,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -708,10 +707,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // called.
    int instance_id_ = 1;
  
@@ -578,26 +596,25 @@ index 4b08ffd8b662..a09bdc7cb892 100644
                             std::move(client), creation_context_type,
                             blink::MessagePortChannel(std::move(message_port)));
 diff --git content/browser/shared_worker/shared_worker_service_impl.cc content/browser/shared_worker/shared_worker_service_impl.cc
-index 5589e34dec3f..85fe4dededa7 100644
+index 597e99215428..29c6ba3049b7 100644
 --- content/browser/shared_worker/shared_worker_service_impl.cc
 +++ content/browser/shared_worker/shared_worker_service_impl.cc
-@@ -167,8 +167,9 @@ void SharedWorkerServiceImpl::ConnectToWorker(
-     BrowserThread::PostTask(
+@@ -206,8 +206,8 @@ void SharedWorkerServiceImpl::CreateWorker(
          BrowserThread::IO, FROM_HERE,
-         base::BindOnce(&CreateScriptLoaderOnIO,
--                       service_worker_context_->storage_partition()
--                           ->url_loader_factory_getter(),
-+                       base::WrapRefCounted(
-+                          service_worker_context_->storage_partition()
-+                              ->url_loader_factory_getter()),
-                        service_worker_context_, process_id,
-                        base::BindOnce(&SharedWorkerServiceImpl::CreateWorker,
-                                       weak_factory_.GetWeakPtr(),
+         base::BindOnce(
+             &CreateScriptLoaderOnIO,
+-            service_worker_context_->storage_partition()
+-                ->url_loader_factory_getter(),
++            base::WrapRefCounted(service_worker_context_->storage_partition()
++                ->url_loader_factory_getter()),
+             service_worker_context_, process_id,
+             base::BindOnce(&SharedWorkerServiceImpl::StartWorker,
+                            weak_factory_.GetWeakPtr(), std::move(instance),
 diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h
-index 38d0aadaad67..730406c96605 100644
+index 2cf35167ebaa..646392017593 100644
 --- content/browser/storage_partition_impl.h
 +++ content/browser/storage_partition_impl.h
-@@ -102,7 +102,7 @@ class CONTENT_EXPORT StoragePartitionImpl
+@@ -96,7 +96,7 @@ class CONTENT_EXPORT StoragePartitionImpl
    storage::FileSystemContext* GetFileSystemContext() override;
    storage::DatabaseTracker* GetDatabaseTracker() override;
    DOMStorageContextWrapper* GetDOMStorageContext() override;
@@ -606,7 +623,7 @@ index 38d0aadaad67..730406c96605 100644
    IndexedDBContextImpl* GetIndexedDBContext() override;
    CacheStorageContextImpl* GetCacheStorageContext() override;
    ServiceWorkerContextWrapper* GetServiceWorkerContext() override;
-@@ -141,14 +141,14 @@ class CONTENT_EXPORT StoragePartitionImpl
+@@ -135,14 +135,14 @@ class CONTENT_EXPORT StoragePartitionImpl
    void FlushNetworkInterfaceForTesting() override;
    void WaitForDeletionTasksForTesting() override;
  
@@ -629,7 +646,7 @@ index 38d0aadaad67..730406c96605 100644
  
    // mojom::StoragePartitionService interface.
    void OpenLocalStorage(const url::Origin& origin,
-@@ -157,18 +157,18 @@ class CONTENT_EXPORT StoragePartitionImpl
+@@ -151,18 +151,18 @@ class CONTENT_EXPORT StoragePartitionImpl
        const std::string& namespace_id,
        mojom::SessionStorageNamespaceRequest request) override;
  
@@ -652,7 +669,7 @@ index 38d0aadaad67..730406c96605 100644
  
    auto& bindings_for_testing() { return bindings_; }
  
-@@ -179,10 +179,11 @@ class CONTENT_EXPORT StoragePartitionImpl
+@@ -173,10 +173,11 @@ class CONTENT_EXPORT StoragePartitionImpl
    // one must use the "chrome-guest://blahblah" site URL to ensure that the
    // service worker stays in this StoragePartition. This is an empty GURL if
    // this StoragePartition is not for guests.
@@ -754,10 +771,10 @@ index ddb422866966..5f0996729c1c 100644
        std::map<std::string, service_manager::EmbeddedServiceInfo>;
  
 diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h
-index ec12926fcbbb..0e583b393936 100644
+index 5a3984eb6efb..fa57b523eaf2 100644
 --- content/public/browser/storage_partition.h
 +++ content/public/browser/storage_partition.h
-@@ -13,6 +13,7 @@
+@@ -14,6 +14,7 @@
  #include "base/files/file_path.h"
  #include "base/time/time.h"
  #include "content/common/content_export.h"
@@ -765,7 +782,7 @@ index ec12926fcbbb..0e583b393936 100644
  #include "net/cookies/cookie_store.h"
  #include "services/network/public/cpp/shared_url_loader_factory.h"
  
-@@ -58,12 +59,27 @@ class ServiceWorkerContext;
+@@ -59,12 +60,27 @@ class ServiceWorkerContext;
  class SharedWorkerService;
  class WebPackageContext;
  
@@ -793,7 +810,7 @@ index ec12926fcbbb..0e583b393936 100644
  // Defines what persistent state a child process can access.
  //
  // The StoragePartition defines the view each child process has of the
-@@ -96,6 +112,7 @@ class CONTENT_EXPORT StoragePartition {
+@@ -97,6 +113,7 @@ class CONTENT_EXPORT StoragePartition {
    virtual storage::FileSystemContext* GetFileSystemContext() = 0;
    virtual storage::DatabaseTracker* GetDatabaseTracker() = 0;
    virtual DOMStorageContext* GetDOMStorageContext() = 0;
@@ -801,7 +818,7 @@ index ec12926fcbbb..0e583b393936 100644
    virtual IndexedDBContext* GetIndexedDBContext() = 0;
    virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
    virtual SharedWorkerService* GetSharedWorkerService() = 0;
-@@ -216,6 +233,26 @@ class CONTENT_EXPORT StoragePartition {
+@@ -213,6 +230,26 @@ class CONTENT_EXPORT StoragePartition {
    // Wait until all deletions tasks are finished. For test use only.
    virtual void WaitForDeletionTasksForTesting() = 0;