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

device/serial/data_sender.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_SENDER_H_
 #define DEVICE_SERIAL_DATA_SENDER_H_
 
 #include <queue>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/strings/string_piece.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 {
 
 // A DataSender sends data to a DataSink.
-class DataSender : public serial::DataSinkClient, public mojo::ErrorHandler {
+class DataSender : public mojo::ErrorHandler {
  public:
   typedef base::Callback<void(uint32_t bytes_sent)> DataSentCallback;
   typedef base::Callback<void(uint32_t bytes_sent, int32_t error)>
       SendErrorCallback;
   typedef base::Callback<void()> CancelCallback;
 
   // Constructs a DataSender to send data to |sink|, using a buffer size of
   // |buffer_size|, with connection errors reported as |fatal_error_value|.
   DataSender(mojo::InterfacePtr<serial::DataSink> sink,
              uint32_t buffer_size,
@@ skipping 11 matching lines @@
             const DataSentCallback& callback,
             const SendErrorCallback& error_callback);
 
   // Requests the cancellation of any in-progress sends. Calls to Send() will
   // fail until |callback| is called.
   bool Cancel(int32_t error, const CancelCallback& callback);
 
  private:
   class PendingSend;
 
-  // serial::DataSinkClient overrides.
-  void ReportBytesSent(uint32_t bytes_sent) override;
-  void ReportBytesSentAndError(uint32_t bytes_sent,
-                               int32_t error,
-                               const mojo::Callback<void()>& callback) override;
+  // Invoked when a PendingSend completes.
+  void SendComplete();
+
+  // Invoked when a PendingSend fails with |error|.
+  void SendFailed(int32_t error);
 
   // mojo::ErrorHandler override.
   void OnConnectionError() override;
 
-  // Sends up to |available_buffer_capacity_| bytes of data from
-  // |pending_sends_| to |sink_|. When a PendingSend in |pending_sends_| has
-  // been fully copied transmitted to |sink_|, it moves to
-  // |sends_awaiting_ack_|.
-  void SendInternal();
-
   // Dispatches a cancel callback if one is pending.
   void RunCancelCallback();
 
   // Shuts down this DataSender and dispatches fatal errors to all pending
   // operations.
   void ShutDown();
 
   // The control connection to the data sink.
   mojo::InterfacePtr<serial::DataSink> sink_;
 
   // The error value to report in the event of a fatal error.
   const int32_t fatal_error_value_;
 
-  // A queue of PendingSend that have not yet been fully sent to |sink_|.
-  std::queue<linked_ptr<PendingSend> > pending_sends_;
-
   // A queue of PendingSend that have been sent to |sink_|, but have not yet
   // been acked by the DataSink.
-  std::queue<linked_ptr<PendingSend> > sends_awaiting_ack_;
+  std::queue<linked_ptr<PendingSend>> sends_awaiting_ack_;
 
   // The callback to report cancel completion if a cancel operation is in
   // progress.
   CancelCallback pending_cancel_;
 
-  // The number of bytes available for buffering in the DataSink.
-  uint32_t available_buffer_capacity_;
-
   // Whether we have encountered a fatal error and shut down.
   bool shut_down_;
 
   DISALLOW_COPY_AND_ASSIGN(DataSender);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_SERIAL_DATA_SENDER_H_