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

device/serial/data_sink_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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "device/serial/data_sender.h"
 #include "device/serial/data_sink_receiver.h"
@@ skipping 20 matching lines @@
       : bytes_sent_(0),
         send_error_(0),
         has_send_error_(false),
         cancel_error_(0),
         seen_connection_error_(false),
         expected_event_(EVENT_NONE) {}
 
   void SetUp() override {
     message_loop_.reset(new base::MessageLoop);
     mojo::InterfacePtr<serial::DataSink> sink_handle;
-    mojo::InterfacePtr<serial::DataSinkClient> sink_client_handle;
-    mojo::InterfaceRequest<serial::DataSinkClient> sink_client_request =
-        mojo::GetProxy(&sink_client_handle);
-    sink_receiver_ = new DataSinkReceiver(
-        mojo::GetProxy(&sink_handle), sink_client_handle.Pass(),
-        base::Bind(&DataSinkTest::OnDataToRead, base::Unretained(this)),
-        base::Bind(&DataSinkTest::OnCancel, base::Unretained(this)),
-        base::Bind(&DataSinkTest::OnError, base::Unretained(this)));
-    sender_.reset(new DataSender(sink_handle.Pass(), sink_client_request.Pass(),
-                                 kBufferSize, kFatalError));
+    sink_receiver_ = mojo::WeakBindToProxy(
+        new DataSinkReceiver(
+            base::Bind(&DataSinkTest::OnDataToRead, base::Unretained(this)),
+            base::Bind(&DataSinkTest::OnCancel, base::Unretained(this)),
+            base::Bind(&DataSinkTest::OnError, base::Unretained(this))),
+        &sink_handle);
+    sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError));
   }
 
   void TearDown() override {
     read_buffer_.reset();
     message_loop_.reset();
     if (sink_receiver_.get())
       EXPECT_TRUE(sink_receiver_->HasOneRef());
   }
 
   void WaitForEvent(Event event) {
@@ skipping 346 matching lines @@
   sender_.reset();
   ExpectSendError(0, kFatalError);
   ExpectSendError(0, kFatalError);
   ExpectCancelResult();
   if (!seen_connection_error_)
     WaitForEvent(EVENT_ERROR);
   EXPECT_TRUE(seen_connection_error_);
 }
 
 }  // namespace device