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

device/serial/serial_connection_unittest.cc

 // Copyright 2014 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.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
@@ skipping 56 matching lines @@
     mojo::InterfacePtr<serial::SerialService> service;
     mojo::BindToProxy(
         new SerialServiceImpl(
             new SerialConnectionFactory(
                 base::Bind(&SerialConnectionTest::CreateIoHandler,
                            base::Unretained(this)),
                 base::MessageLoopProxy::current()),
             scoped_ptr<SerialDeviceEnumerator>(new FakeSerialDeviceEnumerator)),
         &service);
     service.set_error_handler(this);
-    mojo::InterfacePtr<serial::DataSink> sink;
-    mojo::InterfacePtr<serial::DataSinkClient> sink_client;
-    mojo::InterfaceRequest<serial::DataSinkClient> sink_client_request =
-        mojo::GetProxy(&sink_client);
-    mojo::InterfacePtr<serial::DataSource> source;
-    mojo::InterfacePtr<serial::DataSourceClient> source_client;
-    mojo::InterfaceRequest<serial::DataSourceClient> source_client_request =
-        mojo::GetProxy(&source_client);
-    service->Connect("device", serial::ConnectionOptions::New(),
-                     mojo::GetProxy(&connection_), mojo::GetProxy(&sink),
-                     sink_client.Pass(), mojo::GetProxy(&source),
-                     source_client.Pass());
-    sender_.reset(new DataSender(sink.Pass(), sink_client_request.Pass(),
-                                 kBufferSize, serial::SEND_ERROR_DISCONNECTED));
-    receiver_ =
-        new DataReceiver(source.Pass(), source_client_request.Pass(),
-                         kBufferSize, serial::RECEIVE_ERROR_DISCONNECTED);
+    mojo::InterfacePtr<serial::DataSink> consumer;
+    mojo::InterfacePtr<serial::DataSource> producer;
+    service->Connect("device",
+                     serial::ConnectionOptions::New(),
+                     mojo::GetProxy(&connection_),
+                     mojo::GetProxy(&consumer),
+                     mojo::GetProxy(&producer));
+    sender_.reset(new DataSender(
+        consumer.Pass(), kBufferSize, serial::SEND_ERROR_DISCONNECTED));
+    receiver_ = new DataReceiver(
+        producer.Pass(), kBufferSize, serial::RECEIVE_ERROR_DISCONNECTED);
     connection_.set_error_handler(this);
     connection_->GetInfo(
         base::Bind(&SerialConnectionTest::StoreInfo, base::Unretained(this)));
     WaitForEvent(EVENT_GOT_INFO);
     ASSERT_TRUE(io_handler_.get());
   }
 
   void StoreInfo(serial::ConnectionInfoPtr options) {
     info_ = options.Pass();
     EventReceived(EVENT_GOT_INFO);
@@ skipping 225 matching lines @@
   WaitForEvent(EVENT_DATA_SENT);
   EXPECT_EQ(serial::SEND_ERROR_NONE, send_error_);
   EXPECT_EQ(4, bytes_sent_);
   ASSERT_NO_FATAL_FAILURE(Receive());
   WaitForEvent(EVENT_DATA_RECEIVED);
   EXPECT_EQ("data", data_received_);
   EXPECT_EQ(serial::RECEIVE_ERROR_NONE, receive_error_);
 }
 
 }  // namespace device