chore: bump chromium to adc5df74b86afdff676989ced8cd3 (master) (#26223)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

shell/browser/api/electron_api_app.cc

@@ -473,8 +473,6 @@ int GetPathConstant(const std::string& name) {
   else if (name == "recent")
     return electron::DIR_RECENT;
 #endif
-  else if (name == "pepperFlashSystemPlugin")
-    return chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN;
   else
     return -1;
 }

shell/browser/api/electron_api_cookies.cc

@@ -307,6 +307,9 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
     promise.RejectWithErrorMessage(error);
     return handle;
   }
+  bool same_party =
+      details.FindBoolKey("sameParty")
+          .value_or(secure && same_site != net::CookieSameSite::STRICT_MODE);
 
   GURL url(url_string ? *url_string : "");
   if (!url.is_valid()) {
@@ -322,7 +325,7 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
       ParseTimeProperty(details.FindDoubleKey("creationDate")),
       ParseTimeProperty(details.FindDoubleKey("expirationDate")),
       ParseTimeProperty(details.FindDoubleKey("lastAccessDate")), secure,
-      http_only, same_site, net::COOKIE_PRIORITY_DEFAULT);
+      http_only, same_site, net::COOKIE_PRIORITY_DEFAULT, same_party);
   if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
     promise.RejectWithErrorMessage(
         InclusionStatusToString(net::CookieInclusionStatus(

shell/browser/api/electron_api_power_save_blocker.cc

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/browser/device_service.h"

shell/browser/api/electron_api_web_contents.cc

@@ -38,8 +38,6 @@
 #include "content/browser/renderer_host/render_frame_host_manager.h"  // nogncheck
 #include "content/browser/renderer_host/render_widget_host_impl.h"  // nogncheck
 #include "content/browser/renderer_host/render_widget_host_view_base.h"  // nogncheck
-#include "content/common/widget_messages.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/context_menu_params.h"
 #include "content/public/browser/download_request_utils.h"
@@ -62,6 +60,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer_type_converters.h"
+#include "content/public/common/webplugininfo.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "gin/arguments.h"
@@ -1315,12 +1314,6 @@ void WebContents::RequestToLockMouse(content::WebContents* web_contents,
   permission_helper->RequestPointerLockPermission(user_gesture);
 }
 
-std::unique_ptr<content::BluetoothChooser> WebContents::RunBluetoothChooser(
-    content::RenderFrameHost* frame,
-    const content::BluetoothChooser::EventHandler& event_handler) {
-  return std::make_unique<BluetoothChooser>(this, event_handler);
-}
-
 content::JavaScriptDialogManager* WebContents::GetJavaScriptDialogManager(
     content::WebContents* source) {
   if (!dialog_manager_)

shell/browser/api/electron_api_web_contents.h

@@ -571,9 +571,6 @@ class WebContents : public gin::Wrappable<WebContents>,
   void RequestToLockMouse(content::WebContents* web_contents,
                           bool user_gesture,
                           bool last_unlocked_by_target) override;
-  std::unique_ptr<content::BluetoothChooser> RunBluetoothChooser(
-      content::RenderFrameHost* frame,
-      const content::BluetoothChooser::EventHandler& handler) override;
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
       content::WebContents* source) override;
   void OnAudioStateChanged(bool audible) override;

shell/browser/api/electron_api_web_request.cc

@@ -10,6 +10,7 @@
 
 #include "base/stl_util.h"
 #include "base/values.h"
+#include "extensions/browser/api/web_request/web_request_resource_type.h"
 #include "gin/converter.h"
 #include "gin/dictionary.h"
 #include "gin/object_template_builder.h"
@@ -40,30 +41,30 @@ struct Converter<URLPattern> {
 };
 
 template <>
-struct Converter<blink::mojom::ResourceType> {
+struct Converter<extensions::WebRequestResourceType> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   blink::mojom::ResourceType type) {
+                                   extensions::WebRequestResourceType type) {
     const char* result;
     switch (type) {
-      case blink::mojom::ResourceType::kMainFrame:
+      case extensions::WebRequestResourceType::MAIN_FRAME:
         result = "mainFrame";
         break;
-      case blink::mojom::ResourceType::kSubFrame:
+      case extensions::WebRequestResourceType::SUB_FRAME:
         result = "subFrame";
         break;
-      case blink::mojom::ResourceType::kStylesheet:
+      case extensions::WebRequestResourceType::STYLESHEET:
         result = "stylesheet";
         break;
-      case blink::mojom::ResourceType::kScript:
+      case extensions::WebRequestResourceType::SCRIPT:
         result = "script";
         break;
-      case blink::mojom::ResourceType::kImage:
+      case extensions::WebRequestResourceType::IMAGE:
         result = "image";
         break;
-      case blink::mojom::ResourceType::kObject:
+      case extensions::WebRequestResourceType::OBJECT:
         result = "object";
         break;
-      case blink::mojom::ResourceType::kXhr:
+      case extensions::WebRequestResourceType::XHR:
         result = "xhr";
         break;
       default:
@@ -144,7 +145,7 @@ void ToDictionary(gin::Dictionary* details, extensions::WebRequestInfo* info) {
   details->Set("url", info->url);
   details->Set("method", info->method);
   details->Set("timestamp", base::Time::Now().ToDoubleT() * 1000);
-  details->Set("resourceType", info->type);
+  details->Set("resourceType", info->web_request_type);
   if (!info->response_ip.empty())
     details->Set("ip", info->response_ip);
   if (info->response_headers) {

shell/browser/electron_browser_main_parts.cc

@@ -73,7 +73,7 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gfx/x/x11_types.h"
+#include "ui/gfx/x/connection.h"
 #include "ui/gfx/x/xproto_util.h"
 #include "ui/gtk/x/gtk_ui_delegate_x11.h"
 #endif

shell/browser/extensions/api/management/electron_management_api_delegate.cc

@@ -16,7 +16,6 @@
 #include "base/task/post_task.h"
 #include "chrome/common/extensions/extension_metrics.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
-#include "chrome/common/web_application_info.h"
 #include "chrome/common/webui_url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"

shell/browser/extensions/electron_extension_message_filter.cc

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"

shell/browser/native_window_views.cc

@@ -61,7 +61,7 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/shape.h"
 #include "ui/gfx/x/x11_atom_cache.h"
-#include "ui/gfx/x/x11_types.h"
+#include "ui/gfx/x/xproto.h"
 #endif
 
 #if defined(USE_OZONE) || defined(USE_X11)

shell/browser/osr/osr_render_widget_host_view.cc

@@ -25,7 +25,6 @@
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"  // nogncheck
 #include "content/browser/renderer_host/render_widget_host_delegate.h"  // nogncheck
 #include "content/browser/renderer_host/render_widget_host_owner_delegate.h"  // nogncheck
-#include "content/common/view_messages.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
@@ -501,6 +500,14 @@ gfx::Rect OffScreenRenderWidgetHostView::GetBoundsInRootWindow() {
   return gfx::Rect(size_);
 }
 
+base::Optional<content::DisplayFeature>
+OffScreenRenderWidgetHostView::GetDisplayFeature() {
+  return base::nullopt;
+}
+
+void OffScreenRenderWidgetHostView::SetDisplayFeatureForTesting(
+    const content::DisplayFeature* display_feature) {}
+
 viz::SurfaceId OffScreenRenderWidgetHostView::GetCurrentSurfaceId() const {
   return GetDelegatedFrameHost()
              ? GetDelegatedFrameHost()->GetCurrentSurfaceId()

shell/browser/osr/osr_render_widget_host_view.h

@@ -128,6 +128,9 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
   void GetScreenInfo(blink::ScreenInfo* results) override;
   void TransformPointToRootSurface(gfx::PointF* point) override;
   gfx::Rect GetBoundsInRootWindow(void) override;
+  base::Optional<content::DisplayFeature> GetDisplayFeature() override;
+  void SetDisplayFeatureForTesting(
+      const content::DisplayFeature* display_feature) override;
   viz::SurfaceId GetCurrentSurfaceId() const override;
   std::unique_ptr<content::SyntheticGestureTarget>
   CreateSyntheticGestureTarget() override;

shell/browser/ui/inspectable_web_contents.cc

@@ -343,7 +343,6 @@ 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);
@@ -627,7 +626,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
 #endif
 
 void InspectableWebContents::SetInspectedPageBounds(const gfx::Rect& rect) {
-  DevToolsContentsResizingStrategy strategy(rect, is_docked_);
+  DevToolsContentsResizingStrategy strategy(rect);
   if (contents_resizing_strategy_.Equals(strategy))
     return;
 
@@ -704,7 +703,6 @@ 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

@@ -150,7 +150,10 @@ class InspectableWebContents
   void RecordPerformanceHistogram(const std::string& name,
                                   double duration) override {}
   void RecordUserMetricsAction(const std::string& name) override {}
-  void GetSurveyAPIKey(const DispatchCallback& callback) override {}
+  void ShowSurvey(const DispatchCallback& callback,
+                  const std::string& trigger) override {}
+  void CanShowSurvey(const DispatchCallback& callback,
+                     const std::string& trigger) override {}
 
   // content::DevToolsFrontendHostDelegate:
   void HandleMessageFromDevToolsFrontend(const std::string& message);
@@ -223,7 +226,6 @@ 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/global_menu_bar_x11.cc

@@ -20,8 +20,8 @@
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/keycodes/keysym_to_unicode.h"
 #include "ui/gfx/x/connection.h"
+#include "ui/gfx/x/event.h"
 #include "ui/gfx/x/keysyms/keysyms.h"
-#include "ui/gfx/x/x11.h"
 #include "ui/gfx/x/xproto.h"
 
 // libdbusmenu-glib types

shell/browser/ui/views/menu_bar.cc

@@ -305,8 +305,11 @@ void MenuBar::RebuildChildren() {
   RemoveAllChildViews(true);
   for (int i = 0, n = GetItemCount(); i < n; ++i) {
     auto* button =
-        new SubmenuButton(this, menu_model_->GetLabelAt(i), background_color_);
+        new SubmenuButton(menu_model_->GetLabelAt(i), background_color_);
     button->set_tag(i);
+    button->SetCallback(base::BindRepeating(&MenuBar::ButtonPressed,
+                                            base::Unretained(this),
+                                            base::Unretained(button)));
     AddChildView(button);
   }
   UpdateViewColors();

shell/browser/ui/views/menu_bar.h

@@ -37,7 +37,6 @@ class MenuBarColorUpdater : public views::FocusChangeListener {
 };
 
 class MenuBar : public views::AccessiblePaneView,
-                public views::ButtonListener,
                 public electron::MenuDelegate::Observer {
  public:
   static const char kViewClassName[];
@@ -75,15 +74,13 @@ class MenuBar : public views::AccessiblePaneView,
   void RemovePaneFocus() override;
   void OnThemeChanged() override;
 
- protected:
+ private:
+  friend class MenuBarColorUpdater;
+
   // views::View:
   const char* GetClassName() const override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* source, const ui::Event& event) override;
-
- private:
-  friend class MenuBarColorUpdater;
+  void ButtonPressed(views::Button* source, const ui::Event& event);
 
   void RebuildChildren();
   void UpdateViewColors();

shell/browser/ui/views/submenu_button.cc

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

shell/browser/ui/views/submenu_button.h

@@ -16,9 +16,7 @@ namespace electron {
 // Special button that used by menu bar to show submenus.
 class SubmenuButton : public views::MenuButton {
  public:
-  SubmenuButton(views::ButtonListener* button_listener,
-                const base::string16& title,
-                const SkColor& background_color);
+  SubmenuButton(const base::string16& title, const SkColor& background_color);
   ~SubmenuButton() override;
 
   void SetAcceleratorVisibility(bool visible);

shell/browser/ui/webui/accessibility_ui.cc

@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/optional.h"

shell/browser/ui/x/window_state_watcher.h

@@ -6,7 +6,7 @@
 #define SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
 
 #include "ui/events/platform/x11/x11_event_source.h"
-#include "ui/gfx/x/x11.h"
+#include "ui/gfx/x/event.h"
 
 #include "shell/browser/native_window_views.h"
 

shell/browser/ui/x/x_window_utils.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "ui/gfx/x/x11.h"
+#include "ui/gfx/x/xproto.h"
 
 namespace electron {
 

shell/common/platform_util_win.cc

@@ -16,7 +16,7 @@
 #include <wrl/client.h>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"

shell/utility/electron_content_utility_client.cc

@@ -121,29 +121,25 @@ bool ElectronContentUtilityClient::OnMessageReceived(
   return false;
 }
 
-mojo::ServiceFactory*
-ElectronContentUtilityClient::GetMainThreadServiceFactory() {
-  static base::NoDestructor<mojo::ServiceFactory> factory {
+void ElectronContentUtilityClient::RegisterMainThreadServices(
+    mojo::ServiceFactory& services) {
 #if defined(OS_WIN)
-    RunWindowsIconReader,
+  services.Add(RunWindowsIconReader);
 #endif
 
 #if BUILDFLAG(ENABLE_PRINTING)
-        RunPrintCompositor,
+  services.Add(RunPrintCompositor);
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
     (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN))
-        RunPrintingService,
+  services.Add(RunPrintingService);
 #endif
-  };
-  return factory.get();
 }
 
-mojo::ServiceFactory*
-ElectronContentUtilityClient::GetIOThreadServiceFactory() {
-  static base::NoDestructor<mojo::ServiceFactory> factory{RunProxyResolver};
-  return factory.get();
+void ElectronContentUtilityClient::RegisterIOThreadServices(
+    mojo::ServiceFactory& services) {
+  services.Add(RunProxyResolver);
 }
 
 }  // namespace electron

shell/utility/electron_content_utility_client.h

@@ -18,6 +18,10 @@ namespace printing {
 class PrintingHandler;
 }
 
+namespace mojo {
+class ServiceFactory;
+}  // namespace mojo
+
 namespace electron {
 
 class ElectronContentUtilityClient : public content::ContentUtilityClient {
@@ -27,8 +31,8 @@ class ElectronContentUtilityClient : public content::ContentUtilityClient {
 
   void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
   bool OnMessageReceived(const IPC::Message& message) override;
-  mojo::ServiceFactory* GetMainThreadServiceFactory() override;
-  mojo::ServiceFactory* GetIOThreadServiceFactory() override;
+  void RegisterMainThreadServices(mojo::ServiceFactory& services) override;
+  void RegisterIOThreadServices(mojo::ServiceFactory& services) override;
 
  private:
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN)