| Index: device/serial/serial_io_handler.h
|
| diff --git a/device/serial/serial_io_handler.h b/device/serial/serial_io_handler.h
|
| index d1a4827e30155b7d051a93026c936b822263b69b..00f5eba78ed04f7bc18dfdab290c5be860aebfba 100644
|
| --- a/device/serial/serial_io_handler.h
|
| +++ b/device/serial/serial_io_handler.h
|
| @@ -7,6 +7,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/files/file.h"
|
| #include "base/macros.h"
|
| @@ -69,12 +71,12 @@ class SerialIoHandler : public base::NonThreadSafe,
|
| // Performs an async Read operation. Behavior is undefined if this is called
|
| // while a Read is already pending. Otherwise, the Done or DoneWithError
|
| // method on |buffer| will eventually be called with a result.
|
| - void Read(scoped_ptr<WritableBuffer> buffer);
|
| + void Read(std::unique_ptr<WritableBuffer> buffer);
|
|
|
| // Performs an async Write operation. Behavior is undefined if this is called
|
| // while a Write is already pending. Otherwise, the Done or DoneWithError
|
| // method on |buffer| will eventually be called with a result.
|
| - void Write(scoped_ptr<ReadOnlyBuffer> buffer);
|
| + void Write(std::unique_ptr<ReadOnlyBuffer> buffer);
|
|
|
| // Indicates whether or not a read is currently pending.
|
| bool IsReadPending() const;
|
| @@ -238,11 +240,11 @@ class SerialIoHandler : public base::NonThreadSafe,
|
| // Currently applied connection options.
|
| serial::ConnectionOptions options_;
|
|
|
| - scoped_ptr<WritableBuffer> pending_read_buffer_;
|
| + std::unique_ptr<WritableBuffer> pending_read_buffer_;
|
| serial::ReceiveError read_cancel_reason_;
|
| bool read_canceled_;
|
|
|
| - scoped_ptr<ReadOnlyBuffer> pending_write_buffer_;
|
| + std::unique_ptr<ReadOnlyBuffer> pending_write_buffer_;
|
| serial::SendError write_cancel_reason_;
|
| bool write_canceled_;
|
|
|
|
|