Index: device/serial/serial_io_handler.cc |
diff --git a/device/serial/serial_io_handler.cc b/device/serial/serial_io_handler.cc |
index a5257ed329044ca90bb1d9503a061fdf0fb259fe..09d2442c6a93573da999f16202326044667cc5bb 100644 |
--- a/device/serial/serial_io_handler.cc |
+++ b/device/serial/serial_io_handler.cc |
@@ -4,6 +4,7 @@ |
#include "device/serial/serial_io_handler.h" |
+#include <memory> |
#include <utility> |
#include "base/bind.h" |
@@ -198,7 +199,7 @@ void SerialIoHandler::DoClose(base::File port) { |
// port closed by destructor. |
} |
-void SerialIoHandler::Read(scoped_ptr<WritableBuffer> buffer) { |
+void SerialIoHandler::Read(std::unique_ptr<WritableBuffer> buffer) { |
DCHECK(CalledOnValidThread()); |
DCHECK(!IsReadPending()); |
pending_read_buffer_ = std::move(buffer); |
@@ -207,7 +208,7 @@ void SerialIoHandler::Read(scoped_ptr<WritableBuffer> buffer) { |
ReadImpl(); |
} |
-void SerialIoHandler::Write(scoped_ptr<ReadOnlyBuffer> buffer) { |
+void SerialIoHandler::Write(std::unique_ptr<ReadOnlyBuffer> buffer) { |
DCHECK(CalledOnValidThread()); |
DCHECK(!IsWritePending()); |
pending_write_buffer_ = std::move(buffer); |
@@ -220,7 +221,7 @@ void SerialIoHandler::ReadCompleted(int bytes_read, |
serial::ReceiveError error) { |
DCHECK(CalledOnValidThread()); |
DCHECK(IsReadPending()); |
- scoped_ptr<WritableBuffer> pending_read_buffer = |
+ std::unique_ptr<WritableBuffer> pending_read_buffer = |
std::move(pending_read_buffer_); |
if (error == serial::ReceiveError::NONE) { |
pending_read_buffer->Done(bytes_read); |
@@ -234,7 +235,7 @@ void SerialIoHandler::WriteCompleted(int bytes_written, |
serial::SendError error) { |
DCHECK(CalledOnValidThread()); |
DCHECK(IsWritePending()); |
- scoped_ptr<ReadOnlyBuffer> pending_write_buffer = |
+ std::unique_ptr<ReadOnlyBuffer> pending_write_buffer = |
std::move(pending_write_buffer_); |
if (error == serial::SendError::NONE) { |
pending_write_buffer->Done(bytes_written); |