Update to Chromium version 96.0.4664.0 (#929512)

libcef/browser/alloy/alloy_browser_context.cc

@@ -348,7 +348,8 @@ AlloyBrowserContext::GetDownloadManagerDelegate() {
 }
 
 content::BrowserPluginGuestManager* AlloyBrowserContext::GetGuestManager() {
-  DCHECK(extensions::ExtensionsEnabled());
+  if (!extensions::ExtensionsEnabled())
+    return nullptr;
   return guest_view::GuestViewManager::FromBrowserContext(this);
 }
 

libcef/browser/alloy/alloy_browser_context.h

@@ -96,7 +96,7 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
 
   // Values checked in ProfileNetworkContextService::CreateNetworkContextParams
   // when creating the NetworkContext.
-  bool ShouldRestoreOldSessionCookies() const override {
+  bool ShouldRestoreOldSessionCookies() override {
     return ShouldPersistSessionCookies();
   }
   bool ShouldPersistSessionCookies() const override {

libcef/browser/alloy/alloy_browser_host_impl.cc

@@ -51,7 +51,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "net/base/net_errors.h"
-#include "third_party/blink/public/mojom/page/widget.mojom-test-utils.h"
+#include "third_party/blink/public/mojom/widget/platform_widget.mojom-test-utils.h"
 #include "ui/events/base_event_utils.h"
 
 using content::KeyboardEventProcessingResult;
@@ -126,8 +126,7 @@ class CefWidgetHostInterceptor
   DISALLOW_COPY_AND_ASSIGN(CefWidgetHostInterceptor);
 };
 
-static constexpr base::TimeDelta kRecentlyAudibleTimeout =
-    base::TimeDelta::FromSeconds(2);
+static constexpr base::TimeDelta kRecentlyAudibleTimeout = base::Seconds(2);
 
 }  // namespace
 

libcef/browser/alloy/alloy_content_browser_client.cc

@@ -1206,7 +1206,7 @@ void AlloyContentBrowserClient::OnNetworkServiceCreated(
       network_service);
 }
 
-void AlloyContentBrowserClient::ConfigureNetworkContextParams(
+bool AlloyContentBrowserClient::ConfigureNetworkContextParams(
     content::BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path,
@@ -1216,10 +1216,9 @@ void AlloyContentBrowserClient::ConfigureNetworkContextParams(
   // This method may be called during shutdown when using multi-threaded
   // message loop mode. In that case exit early to avoid crashes.
   if (!SystemNetworkContextManager::GetInstance()) {
-    // This must match the value expected in
+    // Cancel NetworkContext creation in
     // StoragePartitionImpl::InitNetworkContext.
-    network_context_params->context_name = "magic_shutting_down";
-    return;
+    return false;
   }
 
   auto cef_context = CefBrowserContext::FromBrowserContext(context);
@@ -1243,6 +1242,8 @@ void AlloyContentBrowserClient::ConfigureNetworkContextParams(
   // TODO(cef): Remove this and add required NetworkIsolationKeys,
   // this is currently not the case and this was not required pre M84.
   network_context_params->require_network_isolation_key = false;
+
+  return true;
 }
 
 // The sandbox may block read/write access from the NetworkService to
@@ -1271,6 +1272,7 @@ bool AlloyContentBrowserClient::HandleExternalProtocol(
     int frame_tree_node_id,
     content::NavigationUIData* navigation_data,
     bool is_main_frame,
+    network::mojom::WebSandboxFlags sandbox_flags,
     ui::PageTransition page_transition,
     bool has_user_gesture,
     const absl::optional<url::Origin>& initiating_origin,
@@ -1283,6 +1285,7 @@ bool AlloyContentBrowserClient::HandleExternalProtocol(
     content::WebContents::Getter web_contents_getter,
     int frame_tree_node_id,
     content::NavigationUIData* navigation_data,
+    network::mojom::WebSandboxFlags sandbox_flags,
     const network::ResourceRequest& resource_request,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
   mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver =

libcef/browser/alloy/alloy_content_browser_client.h

@@ -172,7 +172,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
       network::mojom::URLLoaderFactoryOverridePtr* factory_override) override;
   void OnNetworkServiceCreated(
       network::mojom::NetworkService* network_service) override;
-  void ConfigureNetworkContextParams(
+  bool ConfigureNetworkContextParams(
       content::BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path,
@@ -187,6 +187,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
       int frame_tree_node_id,
       content::NavigationUIData* navigation_data,
       bool is_main_frame,
+      network::mojom::WebSandboxFlags sandbox_flags,
       ui::PageTransition page_transition,
       bool has_user_gesture,
       const absl::optional<url::Origin>& initiating_origin,
@@ -196,6 +197,7 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
       content::WebContents::Getter web_contents_getter,
       int frame_tree_node_id,
       content::NavigationUIData* navigation_data,
+      network::mojom::WebSandboxFlags sandbox_flags,
       const network::ResourceRequest& request,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
       override;

libcef/browser/alloy/chrome_profile_alloy.cc

@@ -153,15 +153,6 @@ bool ChromeProfileAlloy::WasCreatedByVersionOrLater(
   return false;
 }
 
-void ChromeProfileAlloy::SetExitType(ExitType exit_type) {
-  NOTREACHED();
-}
-
-Profile::ExitType ChromeProfileAlloy::GetLastSessionExitType() const {
-  NOTREACHED();
-  return EXIT_NORMAL;
-}
-
 base::Time ChromeProfileAlloy::GetCreationTime() const {
   NOTREACHED();
   return base::Time();

libcef/browser/alloy/chrome_profile_alloy.h

@@ -44,8 +44,6 @@ class ChromeProfileAlloy : public Profile {
   void set_last_selected_directory(const base::FilePath& path) override;
   GURL GetHomePage() override;
   bool WasCreatedByVersionOrLater(const std::string& version) override;
-  void SetExitType(ExitType exit_type) override;
-  ExitType GetLastSessionExitType() const override;
   base::Time GetCreationTime() const override;
   void SetCreationTimeForTesting(base::Time creation_time) override;
   void RecordPrimaryMainFrameNavigation() override;