chore: bump chromium to 9b2191ea59cba1e2f6da4dbb7dee0 (master) (#25995)

shell/browser/api/electron_api_web_contents.cc

@@ -2881,7 +2881,7 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
       electron_renderer.get());
   auto* raw_ptr = electron_renderer.get();
   (*raw_ptr)->TakeHeapSnapshot(
-      mojo::WrapPlatformFile(file.TakePlatformFile()),
+      mojo::WrapPlatformFile(base::ScopedPlatformFile(file.TakePlatformFile())),
       base::BindOnce(
           [](mojo::AssociatedRemote<mojom::ElectronRenderer>* ep,
              gin_helper::Promise<void> promise, bool success) {

shell/browser/browser_process_impl.cc

@@ -10,7 +10,6 @@
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/federated_learning/floc_blocklist_service.h"  // nogncheck
 #include "components/prefs/in_memory_pref_store.h"
 #include "components/prefs/overlay_user_pref_store.h"
 #include "components/prefs/pref_registry.h"
@@ -239,11 +238,6 @@ BrowserProcessImpl::subresource_filter_ruleset_service() {
   return nullptr;
 }
 
-federated_learning::FlocBlocklistService*
-BrowserProcessImpl::floc_blocklist_service() {
-  return nullptr;
-}
-
 federated_learning::FlocSortingLshClustersService*
 BrowserProcessImpl::floc_sorting_lsh_clusters_service() {
   return nullptr;

shell/browser/browser_process_impl.h

@@ -79,7 +79,6 @@ class BrowserProcessImpl : public BrowserProcess {
   safe_browsing::SafeBrowsingService* safe_browsing_service() override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
-  federated_learning::FlocBlocklistService* floc_blocklist_service() override;
   federated_learning::FlocSortingLshClustersService*
   floc_sorting_lsh_clusters_service() override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()

shell/browser/electron_browser_client.cc

@@ -1285,7 +1285,7 @@ void ElectronBrowserClient::SetUserAgent(const std::string& user_agent) {
 
 void ElectronBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
     int frame_tree_node_id,
-    base::UkmSourceId ukm_source_id,
+    ukm::SourceIdObj ukm_source_id,
     NonNetworkURLLoaderFactoryMap* factories) {
   content::WebContents* web_contents =
       content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
@@ -1488,7 +1488,7 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
     URLLoaderFactoryType type,
     const url::Origin& request_initiator,
     base::Optional<int64_t> navigation_id,
-    base::UkmSourceId ukm_source_id,
+    ukm::SourceIdObj ukm_source_id,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
     mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
         header_client,

shell/browser/electron_browser_client.h

@@ -18,6 +18,7 @@
 #include "content/public/browser/web_contents.h"
 #include "electron/buildflags/buildflags.h"
 #include "net/ssl/client_cert_identity.h"
+#include "services/metrics/public/cpp/ukm_source_id.h"
 #include "shell/browser/serial/electron_serial_delegate.h"
 
 namespace content {
@@ -179,7 +180,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   std::string GetProduct() override;
   void RegisterNonNetworkNavigationURLLoaderFactories(
       int frame_tree_node_id,
-      base::UkmSourceId ukm_source_id,
+      ukm::SourceIdObj ukm_source_id,
       NonNetworkURLLoaderFactoryMap* factories) override;
   void RegisterNonNetworkWorkerMainResourceURLLoaderFactories(
       content::BrowserContext* browser_context,
@@ -204,7 +205,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
       URLLoaderFactoryType type,
       const url::Origin& request_initiator,
       base::Optional<int64_t> navigation_id,
-      base::UkmSourceId ukm_source_id,
+      ukm::SourceIdObj ukm_source_id,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
       mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
           header_client,

shell/browser/electron_browser_context.cc

@@ -337,7 +337,7 @@ ElectronBrowserContext::GetURLLoaderFactory() {
       ->WillCreateURLLoaderFactory(
           this, nullptr, -1,
           content::ContentBrowserClient::URLLoaderFactoryType::kNavigation,
-          url::Origin(), base::nullopt, base::kInvalidUkmSourceId,
+          url::Origin(), base::nullopt, ukm::kInvalidSourceIdObj,
           &factory_receiver, &header_client, nullptr, nullptr, nullptr);
 
   network::mojom::URLLoaderFactoryParamsPtr params =

shell/browser/extensions/api/resources_private/resources_private_api.cc

@@ -107,7 +107,8 @@ ExtensionFunction::ResponseAction ResourcesPrivateGetStringsFunction::Run() {
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, dict.get());
 
-  return RespondNow(OneArgument(std::move(dict)));
+  return RespondNow(
+      OneArgument(base::Value::FromUniquePtrValue(std::move(dict))));
 }
 
 }  // namespace extensions

shell/browser/net/proxying_url_loader_factory.cc

@@ -15,6 +15,7 @@
 #include "net/base/completion_repeating_callback.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_util.h"
+#include "services/metrics/public/cpp/ukm_source_id.h"
 #include "services/network/public/cpp/features.h"
 #include "shell/browser/net/asar/asar_url_loader.h"
 #include "shell/common/options_switches.h"
@@ -110,7 +111,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::UpdateRequestInfo() {
       routing_id_, request_for_info, false,
       !(options_ & network::mojom::kURLLoadOptionSynchronous),
       factory_->IsForServiceWorkerScript(), factory_->navigation_id_,
-      base::kInvalidUkmSourceId));
+      ukm::kInvalidSourceIdObj));
 
   current_request_uses_header_client_ =
       factory_->url_loader_header_client_receiver_.is_bound() &&

shell/browser/net/proxying_websocket.cc

@@ -46,7 +46,7 @@ ProxyingWebSocket::ProxyingWebSocket(
           /*is_async=*/true,
           /*is_service_worker_script=*/false,
           /*navigation_id=*/base::nullopt,
-          /*ukm_source_id=*/base::kInvalidUkmSourceId)) {}
+          /*ukm_source_id=*/ukm::kInvalidSourceIdObj)) {}
 
 ProxyingWebSocket::~ProxyingWebSocket() {
   if (on_before_send_headers_callback_) {

shell/browser/ui/inspectable_web_contents.cc

@@ -343,6 +343,7 @@ InspectableWebContents::InspectableWebContents(
       pref_service_(pref_service),
       web_contents_(web_contents),
       is_guest_(is_guest),
+      is_docked_(true),
       view_(CreateInspectableContentsView(this)),
       weak_factory_(this) {
   const base::Value* bounds_dict = pref_service_->Get(kDevToolsBoundsPref);
@@ -626,7 +627,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
 #endif
 
 void InspectableWebContents::SetInspectedPageBounds(const gfx::Rect& rect) {
-  DevToolsContentsResizingStrategy strategy(rect);
+  DevToolsContentsResizingStrategy strategy(rect, is_docked_);
   if (contents_resizing_strategy_.Equals(strategy))
     return;
 
@@ -703,6 +704,7 @@ void InspectableWebContents::LoadNetworkResource(
 
 void InspectableWebContents::SetIsDocked(const DispatchCallback& callback,
                                          bool docked) {
+  is_docked_ = docked;
   if (managed_devtools_web_contents_)
     view_->SetIsDocked(docked, activate_);
   if (!callback.is_null())

shell/browser/ui/inspectable_web_contents.h

@@ -224,6 +224,7 @@ class InspectableWebContents
   content::WebContents* external_devtools_web_contents_ = nullptr;
 
   bool is_guest_;
+  bool is_docked_;
   std::unique_ptr<InspectableWebContentsView> view_;
 
   class NetworkResourceLoader;

shell/browser/ui/views/submenu_button.cc

@@ -24,7 +24,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* button_listener,
                              const base::string16& title,
                              const SkColor& background_color)
     : views::MenuButton(
-          button_listener,
+          views::Button::PressedCallback(button_listener, this),
           gfx::RemoveAcceleratorChar(title, '&', nullptr, nullptr)),
       background_color_(background_color) {
 #if defined(OS_LINUX)