Convert SerialIoHandler to use buffer interfaces for I/O API methods.

extensions/browser/api/serial/serial_connection.cc

 // 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.
 
 #include "extensions/browser/api/serial/serial_connection.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 115 matching lines @@
     case core_api::serial::STOP_BITS_NONE:
       return device::serial::STOP_BITS_NONE;
     case core_api::serial::STOP_BITS_ONE:
       return device::serial::STOP_BITS_ONE;
     case core_api::serial::STOP_BITS_TWO:
       return device::serial::STOP_BITS_TWO;
   }
   return device::serial::STOP_BITS_NONE;
 }
 
+class SendBuffer : public device::ReadOnlyBuffer {
+ public:
+  SendBuffer(
+      const std::string& data,
+      const base::Callback<void(int, device::serial::SendError)>& callback)
+      : data_(data), callback_(callback) {}
+  virtual ~SendBuffer() {}
+  virtual const char* GetData() OVERRIDE { return data_.c_str(); }
+  virtual uint32_t GetSize() OVERRIDE {
+    return static_cast<uint32_t>(data_.size());
+  }
+  virtual void Done(uint32_t bytes_read) OVERRIDE {
+    callback_.Run(bytes_read, device::serial::SEND_ERROR_NONE);
+  }
+  virtual void DoneWithError(uint32_t bytes_read, int32_t error) OVERRIDE {
+    callback_.Run(bytes_read, static_cast<device::serial::SendError>(error));
+  }
+
+ private:
+  const std::string data_;
+  const base::Callback<void(int, device::serial::SendError)> callback_;
+};
+
+class ReceiveBuffer : public device::WritableBuffer {
+ public:
+  ReceiveBuffer(
+      scoped_refptr<net::IOBuffer> buffer,
+      uint32_t size,
+      const base::Callback<void(int, device::serial::ReceiveError)>& callback)
+      : buffer_(buffer), size_(size), callback_(callback) {}
+  virtual ~ReceiveBuffer() {}
+  virtual char* GetData() OVERRIDE { return buffer_->data(); }
+  virtual uint32_t GetSize() OVERRIDE { return size_; }
+  virtual void Done(uint32_t bytes_written) OVERRIDE {
+    callback_.Run(bytes_written, device::serial::RECEIVE_ERROR_NONE);
+  }
+  virtual void DoneWithError(uint32_t bytes_written, int32_t error) OVERRIDE {
+    callback_.Run(bytes_written,
+                  static_cast<device::serial::ReceiveError>(error));
+  }
+
+ private:
+  scoped_refptr<net::IOBuffer> buffer_;
+  const uint32_t size_;
+  const base::Callback<void(int, device::serial::ReceiveError)> callback_;
+};
+
 }  // namespace
 
 static base::LazyInstance<
     BrowserContextKeyedAPIFactory<ApiResourceManager<SerialConnection> > >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 template <>
 BrowserContextKeyedAPIFactory<ApiResourceManager<SerialConnection> >*
 ApiResourceManager<SerialConnection>::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 SerialConnection::SerialConnection(const std::string& port,
                                    const std::string& owner_extension_id)
     : ApiResource(owner_extension_id),
       port_(port),
       persistent_(false),
       buffer_size_(kDefaultBufferSize),
       receive_timeout_(0),
       send_timeout_(0),
       paused_(false),
       io_handler_(device::SerialIoHandler::Create(
           content::BrowserThread::GetMessageLoopProxyForThread(
               content::BrowserThread::FILE))) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  io_handler_->Initialize(
-      base::Bind(&SerialConnection::OnAsyncReadComplete, AsWeakPtr()),
-      base::Bind(&SerialConnection::OnAsyncWriteComplete, AsWeakPtr()));
 }
 
 SerialConnection::~SerialConnection() {
   io_handler_->CancelRead(device::serial::RECEIVE_ERROR_DISCONNECTED);
   io_handler_->CancelWrite(device::serial::SEND_ERROR_DISCONNECTED);
 }
 
 bool SerialConnection::IsPersistent() const {
   return persistent();
 }
@@ skipping 20 matching lines @@
 void SerialConnection::Open(const OpenCompleteCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   io_handler_->Open(port_, callback);
 }
 
 bool SerialConnection::Receive(const ReceiveCompleteCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!receive_complete_.is_null())
     return false;
   receive_complete_ = callback;
-  io_handler_->Read(buffer_size_);
+  receive_buffer_ = new net::IOBuffer(buffer_size_);
+  io_handler_->Read(scoped_ptr<device::WritableBuffer>(new ReceiveBuffer(
+      receive_buffer_,
+      buffer_size_,
+      base::Bind(&SerialConnection::OnAsyncReadComplete, AsWeakPtr()))));
   receive_timeout_task_.reset();
   if (receive_timeout_ > 0) {
     receive_timeout_task_.reset(new TimeoutTask(
         base::Bind(&SerialConnection::OnReceiveTimeout, AsWeakPtr()),
         base::TimeDelta::FromMilliseconds(receive_timeout_)));
   }
   return true;
 }
 
 bool SerialConnection::Send(const std::string& data,
                             const SendCompleteCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!send_complete_.is_null())
     return false;
   send_complete_ = callback;
-  io_handler_->Write(data);
+  io_handler_->Write(scoped_ptr<device::ReadOnlyBuffer>(new SendBuffer(
+      data, base::Bind(&SerialConnection::OnAsyncWriteComplete, AsWeakPtr()))));
   send_timeout_task_.reset();
   if (send_timeout_ > 0) {
     send_timeout_task_.reset(new TimeoutTask(
         base::Bind(&SerialConnection::OnSendTimeout, AsWeakPtr()),
         base::TimeDelta::FromMilliseconds(send_timeout_)));
   }
   return true;
 }
 
 bool SerialConnection::Configure(
@@ skipping 11 matching lines @@
     set_send_timeout(*options.send_timeout);
   bool success = io_handler_->ConfigurePort(
       *device::serial::ConnectionOptions::From(options));
   io_handler_->CancelRead(device::serial::RECEIVE_ERROR_NONE);
   return success;
 }
 
 void SerialConnection::SetIoHandlerForTest(
     scoped_refptr<device::SerialIoHandler> handler) {
   io_handler_ = handler;
-  io_handler_->Initialize(
-      base::Bind(&SerialConnection::OnAsyncReadComplete, AsWeakPtr()),
-      base::Bind(&SerialConnection::OnAsyncWriteComplete, AsWeakPtr()));
 }
 
 bool SerialConnection::GetInfo(core_api::serial::ConnectionInfo* info) const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   info->paused = paused_;
   info->persistent = persistent_;
   info->name = name_;
   info->buffer_size = buffer_size_;
   info->receive_timeout = receive_timeout_;
   info->send_timeout = send_timeout_;
@@ skipping 36 matching lines @@
 void SerialConnection::OnReceiveTimeout() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   io_handler_->CancelRead(device::serial::RECEIVE_ERROR_TIMEOUT);
 }
 
 void SerialConnection::OnSendTimeout() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   io_handler_->CancelWrite(device::serial::SEND_ERROR_TIMEOUT);
 }
 
-void SerialConnection::OnAsyncReadComplete(const std::string& data,
+void SerialConnection::OnAsyncReadComplete(int bytes_read,
                                            device::serial::ReceiveError error) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!receive_complete_.is_null());
   ReceiveCompleteCallback callback = receive_complete_;
   receive_complete_.Reset();
   receive_timeout_task_.reset();
-  callback.Run(data, ConvertReceiveErrorFromMojo(error));
+  callback.Run(std::string(receive_buffer_->data(), bytes_read),
+               ConvertReceiveErrorFromMojo(error));
+  receive_buffer_ = NULL;
 }
 
 void SerialConnection::OnAsyncWriteComplete(int bytes_sent,
                                             device::serial::SendError error) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!send_complete_.is_null());
   SendCompleteCallback callback = send_complete_;
   send_complete_.Reset();
   send_timeout_task_.reset();
   callback.Run(bytes_sent, ConvertSendErrorFromMojo(error));
@@ skipping 50 matching lines @@
   output->parity_bit = extensions::ConvertParityBitToMojo(input.parity_bit);
   output->stop_bits = extensions::ConvertStopBitsToMojo(input.stop_bits);
   if (input.cts_flow_control.get()) {
     output->has_cts_flow_control = true;
     output->cts_flow_control = *input.cts_flow_control;
   }
   return output.Pass();
 }
 
 }  // namespace mojo