Change RenderFrame to use InterfaceRegistry et al.

services/shell/public/cpp/lib/callback_binder.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
 #define SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
   explicit CallbackBinder(
       const BindCallback& callback,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
       : callback_(callback), task_runner_(task_runner) {}
   ~CallbackBinder() override {}
 
  private:
   // InterfaceBinder:
   void BindInterface(Connection* connection,
       const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle client_handle) override {
+      mojo::ScopedMessagePipeHandle handle) override {
+    mojo::InterfaceRequest<Interface> request =
+        mojo::MakeRequest<Interface>(std::move(handle));
     if (task_runner_) {
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&CallbackBinder::RunCallbackOnTaskRunner, callback_,
-                     base::Passed(&client_handle)));
+                     base::Passed(&request)));
       return;
     }
-    callback_.Run(std::move(client_handle));
+    callback_.Run(std::move(request));
   }
 
   static void RunCallbackOnTaskRunner(
       const BindCallback& callback,
-      mojo::ScopedMessagePipeHandle client_handle) {
-    callback.Run(std::move(client_handle));
+      mojo::InterfaceRequest<Interface> client) {
+    callback.Run(std::move(client));
   }
 
   const BindCallback callback_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   DISALLOW_COPY_AND_ASSIGN(CallbackBinder);
 };
 
+class GenericCallbackBinder : public InterfaceBinder {
+ public:
+  // Method that binds a request for Interface.
+  using BindCallback = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
+
+  explicit GenericCallbackBinder(
+      const BindCallback& callback,
+      const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
+  ~GenericCallbackBinder() override;
+
+ private:
+  // InterfaceBinder:
+  void BindInterface(
+      Connection* connection,
+      const std::string& interface_name,
+      mojo::ScopedMessagePipeHandle handle) override;
+
+  static void RunCallbackOnTaskRunner(
+      const BindCallback& callback,
+      mojo::ScopedMessagePipeHandle client_handle);
+
+  const BindCallback callback_;
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+  DISALLOW_COPY_AND_ASSIGN(GenericCallbackBinder);
+};
+
 }  // namespace internal
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_