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

device/serial/data_receiver.h

 // 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.
 
 #ifndef DEVICE_SERIAL_DATA_RECEIVER_H_
 #define DEVICE_SERIAL_DATA_RECEIVER_H_
 
 #include <queue>
 
 #include "base/callback.h"
@@ skipping 11 matching lines @@
                      public serial::DataSourceClient,
                      public mojo::ErrorHandler {
  public:
   typedef base::Callback<void(scoped_ptr<ReadOnlyBuffer>)> ReceiveDataCallback;
   typedef base::Callback<void(int32_t error)> ReceiveErrorCallback;
 
   // Constructs a DataReceiver to receive data from |source|, using a buffer
   // size of |buffer_size|, with connection errors reported as
   // |fatal_error_value|.
   DataReceiver(mojo::InterfacePtr<serial::DataSource> source,
+               mojo::InterfaceRequest<serial::DataSourceClient> client,
                uint32_t buffer_size,
                int32_t fatal_error_value);
 
   // Begins a receive operation. If this returns true, exactly one of |callback|
   // and |error_callback| will eventually be called. If there is already a
   // receive in progress or there has been a connection error, this will have no
   // effect and return false.
   bool Receive(const ReceiveDataCallback& callback,
                const ReceiveErrorCallback& error_callback);
 
@@ skipping 23 matching lines @@
   // |waiter_| is used to wait until it is ready. If an error occurs in reading
   // |handle_|, ShutDown() is called.
   void ReceiveInternal();
 
   // Called when we encounter a fatal error. If a receive is in progress,
   // |fatal_error_value_| will be reported to the user.
   void ShutDown();
 
   // The control connection to the data source.
   mojo::InterfacePtr<serial::DataSource> source_;
+  mojo::Binding<serial::DataSourceClient> client_;
 
   // The error value to report in the event of a fatal error.
   const int32_t fatal_error_value_;
 
   // Whether we have encountered a fatal error and shut down.
   bool shut_down_;
 
   // The current pending receive operation if there is one.
   scoped_ptr<PendingReceive> pending_receive_;
 
   // The queue of pending data frames (data or an error) received from the
   // DataSource.
   std::queue<linked_ptr<DataFrame>> pending_data_frames_;
 
   base::WeakPtrFactory<DataReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReceiver);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_SERIAL_DATA_RECEIVER_H_