Clean up old Mojo type for mojom::EmbeddedSearch

This CL cleans up old mojo types for mojom::EmbeddedSearch
using PendingAssociatedReceiver, AssociatedReceiver, and
AssociatedRemote.

Bug: 955171
Change-Id: Ia318dd332a4d77f2deb287b47d7338159ad43047
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897402Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#715551}

chrome/browser/ui/search/search_ipc_router.cc

@@ -18,6 +18,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 
@@ -40,10 +41,10 @@ class EmbeddedSearchClientFactoryImpl
   // |web_contents| and |binding| must outlive this object.
   EmbeddedSearchClientFactoryImpl(
       content::WebContents* web_contents,
-      mojo::AssociatedBinding<chrome::mojom::EmbeddedSearch>* binding)
-      : client_binding_(binding), factory_bindings_(web_contents, this) {
+      mojo::AssociatedReceiver<chrome::mojom::EmbeddedSearch>* receiver)
+      : client_receiver_(receiver), factory_bindings_(web_contents, this) {
     DCHECK(web_contents);
-    DCHECK(binding);
+    DCHECK(receiver);
     // Before we are connected to a frame we throw away all messages.
     ignore_result(embedded_search_client_
                       .BindNewEndpointAndPassDedicatedReceiverForTesting());
@@ -55,7 +56,7 @@ class EmbeddedSearchClientFactoryImpl
 
  private:
   void Connect(
-      chrome::mojom::EmbeddedSearchAssociatedRequest request,
+      mojo::PendingAssociatedReceiver<chrome::mojom::EmbeddedSearch> receiver,
       mojo::PendingAssociatedRemote<chrome::mojom::EmbeddedSearchClient> client)
       override;
 
@@ -65,9 +66,9 @@ class EmbeddedSearchClientFactoryImpl
   mojo::AssociatedRemote<chrome::mojom::EmbeddedSearchClient>
       embedded_search_client_;
 
-  // Used to bind incoming interface requests to the implementation, which lives
+  // Used to bind incoming pending receivers to the implementation, which lives
   // in SearchIPCRouter.
-  mojo::AssociatedBinding<chrome::mojom::EmbeddedSearch>* client_binding_;
+  mojo::AssociatedReceiver<chrome::mojom::EmbeddedSearch>* client_receiver_;
 
   // Binding used to listen to connection requests.
   content::WebContentsFrameBindingSet<chrome::mojom::EmbeddedSearchConnector>
@@ -77,14 +78,14 @@ class EmbeddedSearchClientFactoryImpl
 };
 
 void EmbeddedSearchClientFactoryImpl::Connect(
-    chrome::mojom::EmbeddedSearchAssociatedRequest request,
+    mojo::PendingAssociatedReceiver<chrome::mojom::EmbeddedSearch> receiver,
     mojo::PendingAssociatedRemote<chrome::mojom::EmbeddedSearchClient> client) {
   content::RenderFrameHost* frame = factory_bindings_.GetCurrentTargetFrame();
   const bool is_main_frame = frame->GetParent() == nullptr;
   if (!IsInInstantProcess(frame) || !is_main_frame) {
     return;
   }
-  client_binding_->Bind(std::move(request));
+  client_receiver_->Bind(std::move(receiver));
   embedded_search_client_.reset();
   embedded_search_client_.Bind(std::move(client));
 }
@@ -99,9 +100,8 @@ SearchIPCRouter::SearchIPCRouter(content::WebContents* web_contents,
       policy_(std::move(policy)),
       commit_counter_(0),
       is_active_tab_(false),
-      binding_(this),
       embedded_search_client_factory_(
-          new EmbeddedSearchClientFactoryImpl(web_contents, &binding_)) {
+          new EmbeddedSearchClientFactoryImpl(web_contents, &receiver_)) {
   DCHECK(web_contents);
   DCHECK(delegate);
   DCHECK(policy_.get());

chrome/browser/ui/search/search_ipc_router.h

@@ -20,6 +20,7 @@
 #include "components/omnibox/common/omnibox_focus_state.h"
 #include "content/public/browser/web_contents_binding_set.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
 
 #if defined(OS_ANDROID)
 #error "Instant is only used on desktop";
@@ -372,10 +373,10 @@ class SearchIPCRouter : public content::WebContentsObserver,
   // Set to true, when the tab corresponding to |this| instance is active.
   bool is_active_tab_;
 
-  // Binding for the connected main frame. We only allow one frame to connect at
-  // the moment, but this could be extended to a map of connected frames, if
+  // Receiver for the connected main frame. We only allow one frame to connect
+  // at the moment, but this could be extended to a map of connected frames, if
   // desired.
-  mojo::AssociatedBinding<chrome::mojom::EmbeddedSearch> binding_;
+  mojo::AssociatedReceiver<chrome::mojom::EmbeddedSearch> receiver_{this};
 
   std::unique_ptr<EmbeddedSearchClientFactory> embedded_search_client_factory_;
 

chrome/common/search.mojom

@@ -28,7 +28,7 @@ interface EmbeddedSearchConnector {
   // client will use to query the embedded search interface. |client| is the
   // connection used by the embedded search interface implementation to push
   // browser state updates to the client.
-  Connect(associated EmbeddedSearch & embedded_search,
+  Connect(pending_associated_receiver<EmbeddedSearch> embedded_search,
           pending_associated_remote<EmbeddedSearchClient> client);
 };
 

chrome/renderer/searchbox/searchbox.cc

@@ -25,7 +25,6 @@
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -214,11 +213,10 @@ SearchBox::SearchBox(content::RenderFrame* render_frame)
   receiver_.Bind(embedded_search_client.InitWithNewEndpointAndPassReceiver(),
                  render_frame->GetTaskRunner(
                      blink::TaskType::kInternalNavigationAssociated));
-  connector->Connect(
-      mojo::MakeRequest(&embedded_search_service_,
-                        render_frame->GetTaskRunner(
-                            blink::TaskType::kInternalNavigationAssociated)),
-      std::move(embedded_search_client));
+  connector->Connect(embedded_search_service_.BindNewEndpointAndPassReceiver(
+                         render_frame->GetTaskRunner(
+                             blink::TaskType::kInternalNavigationAssociated)),
+                     std::move(embedded_search_client));
 }
 
 SearchBox::~SearchBox() = default;

chrome/renderer/searchbox/searchbox.h

@@ -21,6 +21,7 @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
 #include "url/gurl.h"
 
 // The renderer-side implementation of the embeddedSearch API (see
@@ -246,7 +247,8 @@ class SearchBox : public content::RenderFrameObserver,
   GURL GetURLForMostVisitedItem(InstantRestrictedID item_id) const;
 
   // The connection to the EmbeddedSearch service in the browser process.
-  chrome::mojom::EmbeddedSearchAssociatedPtr embedded_search_service_;
+  mojo::AssociatedRemote<chrome::mojom::EmbeddedSearch>
+      embedded_search_service_;
   mojo::AssociatedReceiver<chrome::mojom::EmbeddedSearchClient> receiver_{this};
 
   // Whether it's legal to execute JavaScript in |render_frame()|.