chore: bump chromium to f5b345dd470f14eef6e44732ccf23 (master) (#20649)

shell/renderer/atom_autofill_agent.cc

@@ -52,19 +52,17 @@ void TrimStringVectorForIPC(std::vector<base::string16>* strings) {
 
 AutofillAgent::AutofillAgent(content::RenderFrame* frame,
                              blink::AssociatedInterfaceRegistry* registry)
-    : content::RenderFrameObserver(frame),
-      binding_(this),
-      weak_ptr_factory_(this) {
+    : content::RenderFrameObserver(frame), weak_ptr_factory_(this) {
   render_frame()->GetWebFrame()->SetAutofillClient(this);
   registry->AddInterface(
-      base::Bind(&AutofillAgent::BindRequest, base::Unretained(this)));
+      base::Bind(&AutofillAgent::BindReceiver, base::Unretained(this)));
 }
 
 AutofillAgent::~AutofillAgent() = default;
 
-void AutofillAgent::BindRequest(
-    mojom::ElectronAutofillAgentAssociatedRequest request) {
-  binding_.Bind(std::move(request));
+void AutofillAgent::BindReceiver(
+    mojo::PendingAssociatedReceiver<mojom::ElectronAutofillAgent> receiver) {
+  receiver_.Bind(std::move(receiver));
 }
 
 void AutofillAgent::OnDestruct() {
@@ -188,8 +186,7 @@ void AutofillAgent::HidePopup() {
 void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
                               const std::vector<base::string16>& values,
                               const std::vector<base::string16>& labels) {
-  gfx::RectF bounds =
-      render_frame()->GetRenderView()->ElementBoundsInWindow(element);
+  gfx::RectF bounds = render_frame()->ElementBoundsInWindow(element);
   GetAutofillDriver()->ShowAutofillPopup(bounds, values, labels);
 }
 
@@ -218,11 +215,11 @@ void AutofillAgent::DoFocusChangeComplete() {
   focused_node_was_last_clicked_ = false;
 }
 
-const mojom::ElectronAutofillDriverAssociatedPtr&
+const mojo::AssociatedRemote<mojom::ElectronAutofillDriver>&
 AutofillAgent::GetAutofillDriver() {
   if (!autofill_driver_) {
     render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
-        mojo::MakeRequest(&autofill_driver_));
+        &autofill_driver_);
   }
 
   return autofill_driver_;

shell/renderer/atom_autofill_agent.h

@@ -9,7 +9,9 @@
 
 #include "base/memory/weak_ptr.h"
 #include "content/public/renderer/render_frame_observer.h"
-#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "shell/common/api/api.mojom.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 #include "third_party/blink/public/web/web_autofill_client.h"
@@ -27,7 +29,8 @@ class AutofillAgent : public content::RenderFrameObserver,
                          blink::AssociatedInterfaceRegistry* registry);
   ~AutofillAgent() override;
 
-  void BindRequest(mojom::ElectronAutofillAgentAssociatedRequest request);
+  void BindReceiver(
+      mojo::PendingAssociatedReceiver<mojom::ElectronAutofillAgent> receiver);
 
   // content::RenderFrameObserver:
   void OnDestruct() override;
@@ -67,8 +70,9 @@ class AutofillAgent : public content::RenderFrameObserver,
 
   void DoFocusChangeComplete();
 
-  const mojom::ElectronAutofillDriverAssociatedPtr& GetAutofillDriver();
-  mojom::ElectronAutofillDriverAssociatedPtr autofill_driver_;
+  const mojo::AssociatedRemote<mojom::ElectronAutofillDriver>&
+  GetAutofillDriver();
+  mojo::AssociatedRemote<mojom::ElectronAutofillDriver> autofill_driver_;
 
   // True when the last click was on the focused node.
   bool focused_node_was_last_clicked_ = false;
@@ -78,7 +82,7 @@ class AutofillAgent : public content::RenderFrameObserver,
   // already focused, or if it caused the focus to change.
   bool was_focused_before_now_ = false;
 
-  mojo::AssociatedBinding<mojom::ElectronAutofillAgent> binding_;
+  mojo::AssociatedReceiver<mojom::ElectronAutofillAgent> receiver_{this};
 
   base::WeakPtrFactory<AutofillAgent> weak_ptr_factory_;
 

shell/renderer/atom_render_frame_observer.cc

@@ -33,14 +33,12 @@ namespace electron {
 
 namespace {
 
-base::StringPiece NetResourceProvider(int key) {
+scoped_refptr<base::RefCountedMemory> NetResourceProvider(int key) {
   if (key == IDR_DIR_HEADER_HTML) {
-    base::StringPiece html_data =
-        ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_DIR_HEADER_HTML);
-    return html_data;
+    return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+        IDR_DIR_HEADER_HTML);
   }
-  return base::StringPiece();
+  return nullptr;
 }
 
 }  // namespace
@@ -106,8 +104,7 @@ void AtomRenderFrameObserver::DraggableRegionsChanged() {
   std::vector<mojom::DraggableRegionPtr> regions;
   for (auto& webregion : webregions) {
     auto region = mojom::DraggableRegion::New();
-    render_frame_->GetRenderView()->ConvertViewportToWindowViaWidget(
-        &webregion.bounds);
+    render_frame_->ConvertViewportToWindow(&webregion.bounds);
     region->bounds = webregion.bounds;
     region->draggable = webregion.draggable;
     regions.push_back(std::move(region));

shell/renderer/electron_api_service_impl.cc

@@ -98,18 +98,17 @@ ElectronApiServiceImpl::ElectronApiServiceImpl(
     content::RenderFrame* render_frame,
     RendererClientBase* renderer_client)
     : content::RenderFrameObserver(render_frame),
-      binding_(this),
       renderer_client_(renderer_client),
       weak_factory_(this) {}
 
 void ElectronApiServiceImpl::BindTo(
-    mojom::ElectronRendererAssociatedRequest request) {
+    mojo::PendingAssociatedReceiver<mojom::ElectronRenderer> receiver) {
   // Note: BindTo might be called for multiple times.
-  if (binding_.is_bound())
-    binding_.Unbind();
+  if (receiver_.is_bound())
+    receiver_.reset();
 
-  binding_.Bind(std::move(request));
-  binding_.set_connection_error_handler(
+  receiver_.Bind(std::move(receiver));
+  receiver_.set_disconnect_handler(
       base::BindOnce(&ElectronApiServiceImpl::OnConnectionError, GetWeakPtr()));
 }
 
@@ -122,8 +121,8 @@ void ElectronApiServiceImpl::OnDestruct() {
 }
 
 void ElectronApiServiceImpl::OnConnectionError() {
-  if (binding_.is_bound())
-    binding_.Unbind();
+  if (receiver_.is_bound())
+    receiver_.reset();
 }
 
 void ElectronApiServiceImpl::Message(bool internal,

shell/renderer/electron_api_service_impl.h

@@ -12,7 +12,8 @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/shell/common/api/api.mojom.h"
-#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 
 namespace electron {
 
@@ -24,7 +25,8 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
   ElectronApiServiceImpl(content::RenderFrame* render_frame,
                          RendererClientBase* renderer_client);
 
-  void BindTo(mojom::ElectronRendererAssociatedRequest request);
+  void BindTo(
+      mojo::PendingAssociatedReceiver<mojom::ElectronRenderer> receiver);
 
   void Message(bool internal,
                bool send_to_all,
@@ -55,7 +57,7 @@ class ElectronApiServiceImpl : public mojom::ElectronRenderer,
   // Whether the DOM document element has been created.
   bool document_created_ = false;
 
-  mojo::AssociatedBinding<mojom::ElectronRenderer> binding_;
+  mojo::AssociatedReceiver<mojom::ElectronRenderer> receiver_{this};
 
   RendererClientBase* renderer_client_;
   base::WeakPtrFactory<ElectronApiServiceImpl> weak_factory_;