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

device/serial/data_sink_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_SINK_RECEIVER_H_
 #define DEVICE_SERIAL_DATA_SINK_RECEIVER_H_
 
 #include <queue>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "device/serial/buffer.h"
 #include "device/serial/data_stream.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
 class DataSinkReceiver : public base::RefCounted<DataSinkReceiver>,
-                         public serial::DataSink,
-                         public mojo::ErrorHandler {
+                         public mojo::InterfaceImpl<serial::DataSink> {
  public:
   typedef base::Callback<void(scoped_ptr<ReadOnlyBuffer>)> ReadyCallback;
   typedef base::Callback<void(int32_t error)> CancelCallback;
   typedef base::Callback<void()> ErrorCallback;
 
   // Constructs a DataSinkReceiver. Whenever the pipe is ready for reading, the
   // |ready_callback| will be called with the ReadOnlyBuffer to read.
   // |ready_callback| will not be called again until the previous ReadOnlyBuffer
   // is destroyed. If a connection error occurs, |error_callback| will be called
   // and the DataSinkReceiver will act as if ShutDown() had been called. If
   // |cancel_callback| is valid, it will be called when the DataSinkClient
   // requests cancellation of the in-progress read.
-  DataSinkReceiver(mojo::InterfaceRequest<serial::DataSink> request,
-                   mojo::InterfacePtr<serial::DataSinkClient> client,
-                   const ReadyCallback& ready_callback,
+  DataSinkReceiver(const ReadyCallback& ready_callback,
                    const CancelCallback& cancel_callback,
                    const ErrorCallback& error_callback);
 
   // Shuts down this DataSinkReceiver. After shut down, |ready_callback|,
   // |cancel_callback| and |error_callback| will never be called.
   void ShutDown();
 
  private:
   class Buffer;
   class DataFrame;
@@ skipping 23 matching lines @@
   // Sends an ReportBytesSentAndError message to the client.
   void ReportBytesSentAndError(uint32_t bytes_read, int32_t error);
 
   // Invoked in response to an ReportBytesSentAndError call to the client at
   // the point in the data stream to flush.
   void DoFlush();
 
   // Reports a fatal error to the client and shuts down.
   void DispatchFatalError();
 
-  mojo::Binding<serial::DataSink> binding_;
-  mojo::InterfacePtr<serial::DataSinkClient> client_;
-
   // The callback to call when there is data ready to read.
   const ReadyCallback ready_callback_;
 
   // The callback to call when the client has requested cancellation.
   const CancelCallback cancel_callback_;
 
   // The callback to call if a fatal error occurs.
   const ErrorCallback error_callback_;
 
   // Whether we are waiting for a flush.
@@ skipping 17 matching lines @@
   bool shut_down_;
 
   base::WeakPtrFactory<DataSinkReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DataSinkReceiver);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_SERIAL_DATA_SINK_RECEIVER_H_