Change data pipe wrappers used by SerialConnection to use message pipe.

device/serial/data_source_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_SOURCE_SENDER_H_
 #define DEVICE_SERIAL_DATA_SOURCE_SENDER_H_
 
 #include "base/callback.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 "mojo/public/cpp/system/data_pipe.h"
 
 namespace device {
 
-class AsyncWaiter;
-
 // A DataSourceSender is an interface between a source of data and a data pipe.
 class DataSourceSender : public base::RefCounted<DataSourceSender>,
                          public mojo::InterfaceImpl<serial::DataSource> {
  public:
   typedef base::Callback<void(scoped_ptr<WritableBuffer>)> ReadyCallback;
   typedef base::Callback<void()> ErrorCallback;
 
   // Constructs a DataSourceSender. Whenever the pipe is ready for writing, the
   // |ready_callback| will be called with the WritableBuffer to be filled.
   // |ready_callback| will not be called again until the previous WritableBuffer
   // is destroyed. If a connection error occurs, |error_callback| will be
   // called and the DataSourceSender will act as if ShutDown() had been called.
   DataSourceSender(const ReadyCallback& ready_callback,
                    const ErrorCallback& error_callback);
 
   // Shuts down this DataSourceSender. After shut down, |ready_callback| and
   // |error_callback| will never be called.
   void ShutDown();
 
  private:
   friend class base::RefCounted<DataSourceSender>;
   class PendingSend;
 
   virtual ~DataSourceSender();
 
   // mojo::InterfaceImpl<serial::DataSourceSender> overrides.
-  virtual void Init(mojo::ScopedDataPipeProducerHandle handle) override;
+  virtual void Init(uint32_t buffer_size) override;
   virtual void Resume() override;
+  virtual void AckData(uint32_t bytes_dispatched) override;
   // Invoked in the event of a connection error. Calls DispatchFatalError().
   virtual void OnConnectionError() override;
 
-  // Starts waiting for |handle_| to be ready for writes.
-  void StartWaiting();
-
-  // Invoked when |handle_| is ready for writes.
-  void OnDoneWaiting(MojoResult result);
+  // Gets more data to send to the DataSourceClient.
+  void GetMoreData();
 
   // Reports a successful write of |bytes_written|.
   void Done(uint32_t bytes_written);
 
   // Reports a partially successful or unsuccessful write of |bytes_written|
   // with an error of |error|.
   void DoneWithError(uint32_t bytes_written, int32_t error);
 
   // Finishes the two-phase data pipe write.
   void DoneInternal(uint32_t bytes_written);
 
   // Reports a fatal error to the client and shuts down.
   void DispatchFatalError();
 
-  // The data connection to the data receiver.
-  mojo::ScopedDataPipeProducerHandle handle_;
-
-  // The callback to call when |handle_| is ready for more data.
+  // The callback to call when the client is ready for more data.
   ReadyCallback ready_callback_;
 
   // The callback to call if a fatal error occurs.
   ErrorCallback error_callback_;
 
   // The current pending send operation if there is one.
   scoped_ptr<PendingSend> pending_send_;
 
-  // A waiter used to wait until |handle_| is writable if we are waiting.
-  scoped_ptr<AsyncWaiter> waiter_;
-
-  // The number of bytes sent to the data receiver.
-  uint32_t bytes_sent_;
+  // The number of bytes that have been sent to the client, but have not been
+  // acknowledged.

[raymes, 2014/10/17 04:04:45]

Please see my other note on the similar comment in data_sender.cc.

[Sam McNally, 2014/10/20 05:12:59]

Done.

+  uint32_t available_buffer_capacity_;
 
   // Whether we have encountered a fatal error and shut down.
   bool shut_down_;
 
+  base::WeakPtrFactory<DataSourceSender> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(DataSourceSender);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_SERIAL_DATA_SOURCE_SENDER_H_