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

device/serial/data_source_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_source_sender.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 53 matching lines @@
   // The DataSourceSender of whose buffer we are providing a view.
   scoped_refptr<DataSourceSender> sender_;
 
   // The PendingSend to which this buffer has been created in response.
   PendingSend* pending_send_;
 
   char* buffer_;
   uint32_t buffer_size_;
 };
 
-DataSourceSender::DataSourceSender(const ReadyCallback& ready_callback,
-                                   const ErrorCallback& error_callback)
-    : ready_callback_(ready_callback),
+DataSourceSender::DataSourceSender(
+    mojo::InterfaceRequest<serial::DataSource> source,
+    mojo::InterfacePtr<serial::DataSourceClient> client,
+    const ReadyCallback& ready_callback,
+    const ErrorCallback& error_callback)
+    : binding_(this, source.Pass()),
+      client_(client.Pass()),
+      ready_callback_(ready_callback),
       error_callback_(error_callback),
       available_buffer_capacity_(0),
       paused_(false),
       shut_down_(false),
       weak_factory_(this) {
   DCHECK(!ready_callback.is_null() && !error_callback.is_null());
+  binding_.set_error_handler(this);
+  client_.set_error_handler(this);
 }
 
 void DataSourceSender::ShutDown() {
   shut_down_ = true;
   ready_callback_.Reset();
   error_callback_.Reset();
 }
 
 DataSourceSender::~DataSourceSender() {
   DCHECK(shut_down_);
@@ skipping 38 matching lines @@
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&DataSourceSender::GetMoreData, weak_factory_.GetWeakPtr()));
   }
 }
 
 void DataSourceSender::DoneWithError(const std::vector<char>& data,
                                      int32_t error) {
   DoneInternal(data);
   if (!shut_down_)
-    client()->OnError(error);
+    client_->OnError(error);
   paused_ = true;
   // We don't call GetMoreData here so we don't send any additional data until
   // Resume() is called.
 }
 
 void DataSourceSender::DoneInternal(const std::vector<char>& data) {
   DCHECK(pending_send_);
   if (shut_down_)
     return;
 
   available_buffer_capacity_ -= static_cast<uint32_t>(data.size());
   if (!data.empty()) {
     mojo::Array<uint8_t> data_to_send(data.size());
     std::copy(data.begin(), data.end(), &data_to_send[0]);
-    client()->OnData(data_to_send.Pass());
+    client_->OnData(data_to_send.Pass());
   }
   pending_send_.reset();
 }
 
 void DataSourceSender::DispatchFatalError() {
   if (shut_down_)
     return;
 
   error_callback_.Run();
   ShutDown();
@@ skipping 66 matching lines @@
     uint32_t bytes_written,
     int32_t error) {
   DCHECK(sender_.get());
   PendingSend* send = pending_send_;
   pending_send_ = nullptr;
   send->DoneWithError(bytes_written, error);
   sender_ = nullptr;
 }
 
 }  // namespace device