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

device/serial/data_sink_receiver.h

Index: device/serial/data_sink_receiver.h
diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h
index 0709f90d0ee7728f18373ff7552076755a2bd403..2126cdd947ed855ae36604245c8ea2c11a43e24f 100644
--- a/device/serial/data_sink_receiver.h
+++ b/device/serial/data_sink_receiver.h
@@ -18,8 +18,7 @@
 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;
@@ -32,9 +31,7 @@
   // 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);
 
@@ -78,9 +75,6 @@
   // 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_;