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

device/serial/data_receiver.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_receiver.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 89 matching lines @@
   // The offset within |data| at which the next read should begin.
   uint32_t offset;
 
   // The value of the error that occurred.
   const int32_t error;
 
   // Whether the error has been dispatched to the user.
   bool dispatched;
 };
 
-DataReceiver::DataReceiver(mojo::InterfacePtr<serial::DataSource> source,
-                           uint32_t buffer_size,
-                           int32_t fatal_error_value)
+DataReceiver::DataReceiver(
+    mojo::InterfacePtr<serial::DataSource> source,
+    mojo::InterfaceRequest<serial::DataSourceClient> client,
+    uint32_t buffer_size,
+    int32_t fatal_error_value)
     : source_(source.Pass()),
+      client_(this, client.Pass()),
       fatal_error_value_(fatal_error_value),
       shut_down_(false),
       weak_factory_(this) {
-  source_.set_client(this);
   source_.set_error_handler(this);
   source_->Init(buffer_size);
+  client_.set_error_handler(this);
 }
 
 bool DataReceiver::Receive(const ReceiveDataCallback& callback,
                            const ReceiveErrorCallback& error_callback) {
   DCHECK(!callback.is_null() && !error_callback.is_null());
   if (pending_receive_ || shut_down_)
     return false;
   // When the DataSource encounters an error, it pauses transmission. When the
   // user starts a new receive following notification of the error (via
   // |error_callback| of the previous Receive call) of the error we can tell the
@@ skipping 146 matching lines @@
   buffer_size_ = 0;
 }
 
 void DataReceiver::PendingReceive::Buffer::DoneWithError(
     uint32_t bytes_consumed,
     int32_t error) {
   Done(bytes_consumed);
 }
 
 }  // namespace device