Convert WiFiDisplaySessionService to new Mojo types

This CL converts WiFiDisplaySessionService{Ptr, Request} in
extensions to the new Mojo type.

Bug: 955171
Change-Id: I5eba79faacfb08a099feeca4d003270f21c5364a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862456Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#706313}

extensions/browser/api/display_source/wifi_display/wifi_display_session_service_impl.cc

@@ -8,7 +8,6 @@
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/api/display_source/display_source_connection_delegate_factory.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace {
 const char kErrorCannotHaveMultipleSessions[] =
@@ -33,17 +32,17 @@ WiFiDisplaySessionServiceImpl::~WiFiDisplaySessionServiceImpl() {
 }
 
 // static
-void WiFiDisplaySessionServiceImpl::BindToRequest(
+void WiFiDisplaySessionServiceImpl::BindToReceiver(
     content::BrowserContext* browser_context,
-    WiFiDisplaySessionServiceRequest request,
+    mojo::PendingReceiver<WiFiDisplaySessionService> receiver,
     content::RenderFrameHost* render_frame_host) {
   DisplaySourceConnectionDelegate* delegate =
       DisplaySourceConnectionDelegateFactory::GetForBrowserContext(
           browser_context);
   CHECK(delegate);
   auto* impl = new WiFiDisplaySessionServiceImpl(delegate);
-  impl->binding_ =
-      mojo::MakeStrongBinding(base::WrapUnique(impl), std::move(request));
+  impl->receiver_ =
+      mojo::MakeSelfOwnedReceiver(base::WrapUnique(impl), std::move(receiver));
 }
 
 void WiFiDisplaySessionServiceImpl::SetClient(
@@ -200,7 +199,7 @@ void WiFiDisplaySessionServiceImpl::OnDisconnectFailed(
 
 void WiFiDisplaySessionServiceImpl::OnClientConnectionError() {
   DLOG(ERROR) << "IPC connection error";
-  binding_->Close();
+  receiver_->reset();
 }
 
 }  // namespace extensions

extensions/browser/api/display_source/wifi_display/wifi_display_session_service_impl.h

@@ -8,10 +8,10 @@
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "extensions/browser/api/display_source/display_source_connection_delegate.h"
 #include "extensions/common/mojom/wifi_display_session_service.mojom.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/pending_reciever.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace content {
 class BrowserContext;
@@ -27,9 +27,10 @@ class WiFiDisplaySessionServiceImpl
       public DisplaySourceConnectionDelegate::Observer {
  public:
   ~WiFiDisplaySessionServiceImpl() override;
-  static void BindToRequest(content::BrowserContext* browser_context,
-                            mojom::WiFiDisplaySessionServiceRequest request,
-                            content::RenderFrameHost* render_frame_host);
+  static void BindToReceiver(
+      content::BrowserContext* browser_context,
+      mojo::PendingReceiver<mojom::WiFiDisplaySessionService> receiver,
+      content::RenderFrameHost* render_frame_host);
 
  private:
   // WiFiDisplaySessionService overrides.
@@ -67,7 +68,7 @@ class WiFiDisplaySessionServiceImpl
   // Id of the sink of the session this object is associated with.
   int sink_id_;
 
-  mojo::StrongBindingPtr<mojom::WiFiDisplaySessionService> binding_;
+  mojo::SelfOwnedReceiverRef<mojom::WiFiDisplaySessionService> receiver_;
   base::WeakPtrFactory<WiFiDisplaySessionServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WiFiDisplaySessionServiceImpl);

extensions/browser/mojo/interface_registration.cc

@@ -60,7 +60,7 @@ void RegisterInterfacesForExtension(service_manager::BinderRegistryWithArgs<
   if (ExtensionHasPermission(extension, render_frame_host->GetProcess(),
                              "displaySource")) {
     registry->AddInterface(
-        base::Bind(WiFiDisplaySessionServiceImpl::BindToRequest,
+        base::Bind(WiFiDisplaySessionServiceImpl::BindToReceiver,
                    render_frame_host->GetProcess()->GetBrowserContext()));
     registry->AddInterface(
         base::Bind(WiFiDisplayMediaServiceImpl::BindToRequest));

extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

@@ -11,6 +11,7 @@
 #include "extensions/common/mojom/wifi_display_session_service.mojom.h"
 #include "extensions/renderer/api/display_source/display_source_session.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/wds/src/libwds/public/source.h"
 
 namespace base {
@@ -74,7 +75,7 @@ class WiFiDisplaySession : public DisplaySourceSession,
  private:
   std::unique_ptr<wds::Source> wfd_source_;
   std::unique_ptr<WiFiDisplayMediaManager> media_manager_;
-  mojom::WiFiDisplaySessionServicePtr service_;
+  mojo::Remote<mojom::WiFiDisplaySessionService> service_;
   mojo::Receiver<WiFiDisplaySessionServiceClient> receiver_{this};
   std::string local_ip_address_;
   std::map<int, std::unique_ptr<base::RepeatingTimer>> timers_;