Remove Client= from device/serial/data_stream.mojom.

BUG=451321

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

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

1 files changed, 19 insertions, 11 deletions

diff --git a/device/serial/serial_connection_factory.cc b/device/serial/serial_connection_factory.cc
index 6b01490..9beb33ae 100644
--- a/device/serial/serial_connection_factory.cc
+++ b/device/serial/serial_connection_factory.cc
@@ -37,7 +37,9 @@ class SerialConnectionFactory::ConnectTask
               serial::ConnectionOptionsPtr options,
               mojo::InterfaceRequest<serial::Connection> connection_request,
               mojo::InterfaceRequest<serial::DataSink> sink,
-              mojo::InterfaceRequest<serial::DataSource> source);
+              mojo::InterfacePtr<serial::DataSinkClient> sink_client,
+              mojo::InterfaceRequest<serial::DataSource> source,
+              mojo::InterfacePtr<serial::DataSourceClient> source_client);
   void Run();
 
  private:
@@ -51,7 +53,9 @@ class SerialConnectionFactory::ConnectTask
   serial::ConnectionOptionsPtr options_;
   mojo::InterfaceRequest<serial::Connection> connection_request_;
   mojo::InterfaceRequest<serial::DataSink> sink_;
+  mojo::InterfacePtr<serial::DataSinkClient> sink_client_;
   mojo::InterfaceRequest<serial::DataSource> source_;
+  mojo::InterfacePtr<serial::DataSourceClient> source_client_;
   scoped_refptr<SerialIoHandler> io_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTask);
@@ -69,13 +73,12 @@ void SerialConnectionFactory::CreateConnection(
     serial::ConnectionOptionsPtr options,
     mojo::InterfaceRequest<serial::Connection> connection_request,
     mojo::InterfaceRequest<serial::DataSink> sink,
-    mojo::InterfaceRequest<serial::DataSource> source) {
-  scoped_refptr<ConnectTask> task(new ConnectTask(this,
-                                                  path,
-                                                  options.Pass(),
-                                                  connection_request.Pass(),
-                                                  sink.Pass(),
-                                                  source.Pass()));
+    mojo::InterfacePtr<serial::DataSinkClient> sink_client,
+    mojo::InterfaceRequest<serial::DataSource> source,
+    mojo::InterfacePtr<serial::DataSourceClient> source_client) {
+  scoped_refptr<ConnectTask> task(new ConnectTask(
+      this, path, options.Pass(), connection_request.Pass(), sink.Pass(),
+      sink_client.Pass(), source.Pass(), source_client.Pass()));
   task->Run();
 }
 
@@ -88,13 +91,17 @@ SerialConnectionFactory::ConnectTask::ConnectTask(
     serial::ConnectionOptionsPtr options,
     mojo::InterfaceRequest<serial::Connection> connection_request,
     mojo::InterfaceRequest<serial::DataSink> sink,
-    mojo::InterfaceRequest<serial::DataSource> source)
+    mojo::InterfacePtr<serial::DataSinkClient> sink_client,
+    mojo::InterfaceRequest<serial::DataSource> source,
+    mojo::InterfacePtr<serial::DataSourceClient> source_client)
     : factory_(factory),
       path_(path),
       options_(options.Pass()),
       connection_request_(connection_request.Pass()),
       sink_(sink.Pass()),
-      source_(source.Pass()) {
+      sink_client_(sink_client.Pass()),
+      source_(source.Pass()),
+      source_client_(source_client.Pass()) {
   if (!options_) {
     options_ = serial::ConnectionOptions::New();
   }
@@ -124,7 +131,8 @@ void SerialConnectionFactory::ConnectTask::OnConnected(bool success) {
   }
 
   mojo::BindToRequest(
-      new SerialConnection(io_handler_, sink_.Pass(), source_.Pass()),
+      new SerialConnection(io_handler_, sink_.Pass(), sink_client_.Pass(),
+                           source_.Pass(), source_client_.Pass()),
       &connection_request_);
 }