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

device/serial/data_sender.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 "device/serial/data_sender.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 44 matching lines @@
   const int32_t fatal_error_value_;
 
   // The number of bytes sent to the DataSink.
   uint32_t bytes_sent_;
 
   // The number of bytes acked.
   uint32_t bytes_acked_;
 };
 
 DataSender::DataSender(mojo::InterfacePtr<serial::DataSink> sink,
-                       mojo::InterfaceRequest<serial::DataSinkClient> client,
                        uint32_t buffer_size,
                        int32_t fatal_error_value)
     : sink_(sink.Pass()),
-      client_(this, client.Pass()),
       fatal_error_value_(fatal_error_value),
       available_buffer_capacity_(buffer_size),
       shut_down_(false) {
   sink_.set_error_handler(this);
+  sink_.set_client(this);
   sink_->Init(buffer_size);
-  client_.set_error_handler(this);
 }
 
 DataSender::~DataSender() {
   ShutDown();
 }
 
 bool DataSender::Send(const base::StringPiece& data,
                       const DataSentCallback& callback,
                       const SendErrorCallback& error_callback) {
   DCHECK(!callback.is_null() && !error_callback.is_null());
@@ skipping 163 matching lines @@
   bytes_acked_ += *num_bytes;
   if (bytes_acked_ > bytes_sent_) {
     *num_bytes = bytes_acked_ - bytes_sent_;
     bytes_acked_ = bytes_sent_;
   } else {
     *num_bytes = 0;
   }
 }
 
 }  // namespace device