Update to Chromium version 117.0.5938.0 (#1181205)

This commit is contained in:
Marshall Greenblatt
2023-08-09 17:17:17 -04:00
parent 52cb08b973
commit a4b27a7248
93 changed files with 496 additions and 481 deletions

View File

@ -60,7 +60,7 @@ index cead7cfa14bae..24142c2e4896f 100644
std::unique_ptr<StreamContainer> stream_container(
new StreamContainer(tab_id, embedded, handler_url, extension_id,
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 30d6c2e509ae8..8240b0b078869 100644
index a1e0b689174b8..87908c22f7189 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -62,11 +62,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@ -131,10 +131,10 @@ index 30d6c2e509ae8..8240b0b078869 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 20002c3204d18..a3795d86d1f96 100644
index 9754668feabbf..0fe27053dffcd 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -59,6 +59,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -61,6 +61,12 @@ class ExtensionHost : public DeferredStartRenderHost,
content::SiteInstance* site_instance,
const GURL& url,
mojom::ViewType host_type);
@ -147,7 +147,7 @@ index 20002c3204d18..a3795d86d1f96 100644
ExtensionHost(const ExtensionHost&) = delete;
ExtensionHost& operator=(const ExtensionHost&) = delete;
@@ -69,7 +75,7 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -71,7 +77,7 @@ class ExtensionHost : public DeferredStartRenderHost,
const Extension* extension() const { return extension_; }
const std::string& extension_id() const { return extension_id_; }
@ -156,7 +156,7 @@ index 20002c3204d18..a3795d86d1f96 100644
content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
content::RenderProcessHost* render_process_host() const;
bool has_loaded_once() const { return has_loaded_once_; }
@@ -216,7 +222,8 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -222,7 +228,8 @@ class ExtensionHost : public DeferredStartRenderHost,
raw_ptr<content::BrowserContext> browser_context_;
// The host for our HTML content.
@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
}
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index b70ec0a3bec7e..bb4280ff00696 100644
index c8b79578252a9..fbfac71f6a861 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -32,6 +32,7 @@
@ -217,7 +217,7 @@ index b70ec0a3bec7e..bb4280ff00696 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -257,6 +259,14 @@ class ExtensionsBrowserClient {
@@ -263,6 +265,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;
@ -233,10 +233,10 @@ index b70ec0a3bec7e..bb4280ff00696 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index ac0da20879dc1..46e1eabeccab3 100644
index c9e90b66d739d..cb3e3345a6f30 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -377,9 +377,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -379,9 +379,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();