Remove mojo::InterfaceImpl from device/serial.

BUG=489751

Review URL: https://codereview.chromium.org/1143013002

Cr-Commit-Position: refs/heads/master@{#330698}

device/serial/serial_connection.cc

@@ -16,8 +16,9 @@ SerialConnection::SerialConnection(
     scoped_refptr<SerialIoHandler> io_handler,
     mojo::InterfaceRequest<serial::DataSink> sink,
     mojo::InterfaceRequest<serial::DataSource> source,
-    mojo::InterfacePtr<serial::DataSourceClient> source_client)
-    : io_handler_(io_handler) {
+    mojo::InterfacePtr<serial::DataSourceClient> source_client,
+    mojo::InterfaceRequest<serial::Connection> request)
+    : io_handler_(io_handler), binding_(this, request.Pass()) {
   receiver_ = new DataSinkReceiver(
       sink.Pass(),
       base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)),

device/serial/serial_connection.h

@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "device/serial/serial.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
@@ -18,15 +18,16 @@ class ReadOnlyBuffer;
 class SerialIoHandler;
 class WritableBuffer;
 
-class SerialConnection : public mojo::InterfaceImpl<serial::Connection> {
+class SerialConnection : public serial::Connection {
  public:
   SerialConnection(scoped_refptr<SerialIoHandler> io_handler,
                    mojo::InterfaceRequest<serial::DataSink> sink,
                    mojo::InterfaceRequest<serial::DataSource> source,
-                   mojo::InterfacePtr<serial::DataSourceClient> source_client);
+                   mojo::InterfacePtr<serial::DataSourceClient> source_client,
+                   mojo::InterfaceRequest<serial::Connection> request);
   ~SerialConnection() override;
 
-  // mojo::InterfaceImpl<serial::Connection> overrides.
+  // serial::Connection overrides.
   void GetInfo(
       const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) override;
   void SetOptions(serial::ConnectionOptionsPtr options,
@@ -47,6 +48,8 @@ class SerialConnection : public mojo::InterfaceImpl<serial::Connection> {
   scoped_refptr<DataSinkReceiver> receiver_;
   scoped_refptr<DataSourceSender> sender_;
 
+  mojo::StrongBinding<serial::Connection> binding_;
+
   DISALLOW_COPY_AND_ASSIGN(SerialConnection);
 };
 

device/serial/serial_connection_factory.cc

@@ -125,10 +125,8 @@ void SerialConnectionFactory::ConnectTask::OnConnected(bool success) {
     return;
   }
 
-  mojo::BindToRequest(
-      new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(),
-                           source_client_.Pass()),
-      &connection_request_);
+  new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(),
+                       source_client_.Pass(), connection_request_.Pass());
 }
 
 }  // namespace device

device/serial/serial_connection_unittest.cc

@@ -65,14 +65,13 @@ class SerialConnectionTest : public testing::Test, public mojo::ErrorHandler {
   void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::SerialService> service;
-    mojo::BindToProxy(
-        new SerialServiceImpl(
-            new SerialConnectionFactory(
-                base::Bind(&SerialConnectionTest::CreateIoHandler,
-                           base::Unretained(this)),
-                base::ThreadTaskRunnerHandle::Get()),
-            scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator)),
-        &service);
+    new SerialServiceImpl(
+        new SerialConnectionFactory(
+            base::Bind(&SerialConnectionTest::CreateIoHandler,
+                       base::Unretained(this)),
+            base::ThreadTaskRunnerHandle::Get()),
+        scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator),
+        mojo::GetProxy(&service));
     service.set_error_handler(this);
     mojo::InterfacePtr<serial::DataSink> sink;
     mojo::InterfacePtr<serial::DataSource> source;

device/serial/serial_service_impl.cc

@@ -11,15 +11,18 @@
 namespace device {
 
 SerialServiceImpl::SerialServiceImpl(
-    scoped_refptr<SerialConnectionFactory> connection_factory)
-    : connection_factory_(connection_factory) {
+    scoped_refptr<SerialConnectionFactory> connection_factory,
+    mojo::InterfaceRequest<serial::SerialService> request)
+    : connection_factory_(connection_factory), binding_(this, request.Pass()) {
 }
 
 SerialServiceImpl::SerialServiceImpl(
     scoped_refptr<SerialConnectionFactory> connection_factory,
-    scoped_ptr<SerialDeviceEnumerator> device_enumerator)
+    scoped_ptr<SerialDeviceEnumerator> device_enumerator,
+    mojo::InterfaceRequest<serial::SerialService> request)
     : device_enumerator_(device_enumerator.Pass()),
-      connection_factory_(connection_factory) {
+      connection_factory_(connection_factory),
+      binding_(this, request.Pass()) {
 }
 
 SerialServiceImpl::~SerialServiceImpl() {
@@ -30,12 +33,12 @@ void SerialServiceImpl::Create(
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
     mojo::InterfaceRequest<serial::SerialService> request) {
-  mojo::BindToRequest(
-      new SerialServiceImpl(new SerialConnectionFactory(
+  new SerialServiceImpl(
+      new SerialConnectionFactory(
           base::Bind(SerialIoHandler::Create,
                      base::ThreadTaskRunnerHandle::Get(), ui_task_runner),
-          io_task_runner)),
-      &request);
+          io_task_runner),
+      request.Pass());
 }
 
 // static

device/serial/serial_service_impl.h

@@ -12,16 +12,17 @@
 #include "device/serial/serial.mojom.h"
 #include "device/serial/serial_connection_factory.h"
 #include "device/serial/serial_device_enumerator.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace device {
 
-class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
+class SerialServiceImpl : public serial::SerialService {
  public:
-  explicit SerialServiceImpl(
-      scoped_refptr<SerialConnectionFactory> connection_factory);
   SerialServiceImpl(scoped_refptr<SerialConnectionFactory> connection_factory,
-                    scoped_ptr<SerialDeviceEnumerator> device_enumerator);
+                    mojo::InterfaceRequest<serial::SerialService> request);
+  SerialServiceImpl(scoped_refptr<SerialConnectionFactory> connection_factory,
+                    scoped_ptr<SerialDeviceEnumerator> device_enumerator,
+                    mojo::InterfaceRequest<serial::SerialService> request);
   ~SerialServiceImpl() override;
 
   static void Create(scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
@@ -33,7 +34,7 @@ class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
       mojo::InterfaceRequest<serial::SerialService> request);
 
-  // mojo::InterfaceImpl<SerialService> overrides.
+  // SerialService overrides.
   void GetDevices(
       const mojo::Callback<void(mojo::Array<serial::DeviceInfoPtr>)>& callback)
       override;
@@ -51,6 +52,7 @@ class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
 
   scoped_ptr<SerialDeviceEnumerator> device_enumerator_;
   scoped_refptr<SerialConnectionFactory> connection_factory_;
+  mojo::StrongBinding<serial::SerialService> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(SerialServiceImpl);
 };

device/serial/serial_service_unittest.cc

@@ -74,14 +74,13 @@ class SerialServiceTest : public testing::Test, public mojo::ErrorHandler {
     if (!io_handler_.get())
       io_handler_ = new TestSerialIoHandler;
     mojo::InterfacePtr<serial::SerialService> service;
-    mojo::BindToProxy(
-        new SerialServiceImpl(
-            new SerialConnectionFactory(
-                base::Bind(&SerialServiceTest::ReturnIoHandler,
-                           base::Unretained(this)),
-                base::ThreadTaskRunnerHandle::Get()),
-            scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator)),
-        &service);
+    new SerialServiceImpl(
+        new SerialConnectionFactory(
+            base::Bind(&SerialServiceTest::ReturnIoHandler,
+                       base::Unretained(this)),
+            base::ThreadTaskRunnerHandle::Get()),
+        scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator),
+        mojo::GetProxy(&service));
     mojo::InterfacePtr<serial::Connection> connection;
     mojo::InterfacePtr<serial::DataSink> sink;
     mojo::InterfacePtr<serial::DataSource> source;

extensions/browser/api/serial/serial_apitest.cc

@@ -138,9 +138,8 @@ void CreateTestSerialServiceOnFileThread(
           content::BrowserThread::IO));
   scoped_ptr<device::SerialDeviceEnumerator> device_enumerator(
       new FakeSerialDeviceEnumerator);
-  mojo::BindToRequest(new device::SerialServiceImpl(connection_factory,
-                                                    device_enumerator.Pass()),
-                      &request);
+  new device::SerialServiceImpl(connection_factory, device_enumerator.Pass(),
+                                request.Pass());
 }
 
 void CreateTestSerialService(

extensions/renderer/api/serial/serial_api_unittest.cc

@@ -436,14 +436,13 @@ class SerialApiTest : public ApiTestBase {
 
   void CreateSerialService(
       mojo::InterfaceRequest<device::serial::SerialService> request) {
-    mojo::BindToRequest(new device::SerialServiceImpl(
-                            new device::SerialConnectionFactory(
-                                base::Bind(&SerialApiTest::GetIoHandler,
-                                           base::Unretained(this)),
-                                base::ThreadTaskRunnerHandle::Get()),
-                            scoped_ptr<device::SerialDeviceEnumerator>(
-                                new FakeSerialDeviceEnumerator)),
-                        &request);
+    new device::SerialServiceImpl(
+        new device::SerialConnectionFactory(
+            base::Bind(&SerialApiTest::GetIoHandler, base::Unretained(this)),
+            base::ThreadTaskRunnerHandle::Get()),
+        scoped_ptr<device::SerialDeviceEnumerator>(
+            new FakeSerialDeviceEnumerator),
+        request.Pass());
   }
 
   DISALLOW_COPY_AND_ASSIGN(SerialApiTest);