Clean up old Mojo types for BrowserAssociatedInterfaceTestDriver and WebContentsFrameBindingSetTest

This CL cleans up old Mojo types for
mojom::BrowserAssociatedInterfaceTestDriver and
mojom::WebContentsFrameBindingSetTest with using
AssociatedRemote and PendingAssociatedRecevier.

Bug: 955171
Change-Id: Ifd937d9c3014af8616d12426ad239dce98efee59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1880407Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#709736}

content/browser/browser_associated_interface_unittest.cc

@@ -26,6 +26,7 @@
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -140,7 +141,7 @@ class TestClientRunner {
         base::Thread::Options(base::MessagePumpType::IO, 0));
     ProxyRunner proxy(std::move(pipe), false, io_thread.task_runner());
 
-    mojom::BrowserAssociatedInterfaceTestDriverAssociatedPtr driver;
+    mojo::AssociatedRemote<mojom::BrowserAssociatedInterfaceTestDriver> driver;
     proxy.channel()->GetRemoteAssociatedInterface(&driver);
 
     for (int i = 0; i < kNumTestMessages; ++i) {

content/browser/web_contents_binding_set_browsertest.cc

@@ -14,6 +14,8 @@
 #include "content/public/test/web_contents_binding_set_test_binder.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/test_browser_associated_interfaces.mojom.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace content {
@@ -38,9 +40,10 @@ class TestInterfaceBinder : public WebContentsBindingSetTestBinder<
       : bind_callback_(bind_callback) {}
   ~TestInterfaceBinder() override {}
 
-  void BindRequest(RenderFrameHost* frame_host,
-                   mojom::BrowserAssociatedInterfaceTestDriverAssociatedRequest
-                       request) override {
+  void BindReceiver(
+      RenderFrameHost* frame_host,
+      mojo::PendingAssociatedReceiver<
+          mojom::BrowserAssociatedInterfaceTestDriver> receiver) override {
     bind_callback_.Run();
   }
 
@@ -83,14 +86,15 @@ IN_PROC_BROWSER_TEST_F(WebContentsBindingSetBrowserTest, OverrideForTesting) {
   TestInterfaceBinder test_binder(run_loop.QuitClosure());
   binding_set->SetBinder(&test_binder);
 
-  // Simulate an inbound request for the test interface. This should get routed
+  // Simulate an inbound receiver for the test interface. This should get routed
   // to the overriding binder and allow the test to complete.
-  mojom::BrowserAssociatedInterfaceTestDriverAssociatedPtr override_client;
+  mojo::AssociatedRemote<mojom::BrowserAssociatedInterfaceTestDriver>
+      override_client;
   static_cast<WebContentsImpl*>(web_contents)
       ->OnAssociatedInterfaceRequest(
           web_contents->GetMainFrame(),
           mojom::BrowserAssociatedInterfaceTestDriver::Name_,
-          mojo::MakeRequestAssociatedWithDedicatedPipe(&override_client)
+          override_client.BindNewEndpointAndPassDedicatedReceiverForTesting()
               .PassHandle());
   run_loop.Run();
 
@@ -102,19 +106,19 @@ IN_PROC_BROWSER_TEST_F(WebContentsBindingSetBrowserTest, CloseOnFrameDeletion) {
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL(kTestHost1, "/hello.html")));
 
-  // Simulate an inbound request on the navigated main frame.
+  // Simulate an inbound receiver on the navigated main frame.
   auto* web_contents = shell()->web_contents();
   TestFrameInterfaceBinder binder(web_contents);
-  mojom::WebContentsFrameBindingSetTestAssociatedPtr override_client;
+  mojo::AssociatedRemote<mojom::WebContentsFrameBindingSetTest> override_client;
   static_cast<WebContentsImpl*>(web_contents)
       ->OnAssociatedInterfaceRequest(
           web_contents->GetMainFrame(),
           mojom::WebContentsFrameBindingSetTest::Name_,
-          mojo::MakeRequestAssociatedWithDedicatedPipe(&override_client)
+          override_client.BindNewEndpointAndPassDedicatedReceiverForTesting()
               .PassHandle());
 
   base::RunLoop run_loop;
-  override_client.set_connection_error_handler(run_loop.QuitClosure());
+  override_client.set_disconnect_handler(run_loop.QuitClosure());
 
   // Now navigate the WebContents elsewhere, eventually tearing down the old
   // main frame.

content/public/test/web_contents_binding_set_test_binder.h

@@ -7,7 +7,7 @@
 
 #include "content/public/browser/web_contents_binding_set.h"
 
-#include "mojo/public/cpp/bindings/associated_interface_request.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 
 namespace content {
 
@@ -19,17 +19,17 @@ class WebContentsBindingSetTestBinder : public WebContentsBindingSet::Binder {
  public:
   ~WebContentsBindingSetTestBinder() override {}
 
-  // Call for every new incoming interface request for a frame.
-  virtual void BindRequest(
+  // Call for every new incoming receiver for a frame.
+  virtual void BindReceiver(
       RenderFrameHost* render_frame_host,
-      mojo::AssociatedInterfaceRequest<Interface> request) = 0;
+      mojo::PendingAssociatedReceiver<Interface> receiver) = 0;
 
  private:
   // Binder:
   void OnRequestForFrame(RenderFrameHost* render_frame_host,
                          mojo::ScopedInterfaceEndpointHandle handle) override {
-    BindRequest(render_frame_host,
-                mojo::AssociatedInterfaceRequest<Interface>(std::move(handle)));
+    BindReceiver(render_frame_host,
+                 mojo::PendingAssociatedReceiver<Interface>(std::move(handle)));
   }
 
   void CloseAllBindings() override {}