Index: device/serial/data_source_unittest.cc |
diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc |
index ea871edf1fc9e3543e2674e80a5db133b34ea300..5f30a6c372948c66880b60f5c34d35c61bde23f4 100644 |
--- a/device/serial/data_source_unittest.cc |
+++ b/device/serial/data_source_unittest.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include <stdint.h> |
+#include <utility> |
#include "base/bind.h" |
#include "base/macros.h" |
@@ -40,12 +41,12 @@ class DataSourceTest : public testing::Test { |
mojo::GetProxy(&source_sender_client_handle); |
source_sender_ = new DataSourceSender( |
mojo::GetProxy(&source_sender_handle), |
- source_sender_client_handle.Pass(), |
+ std::move(source_sender_client_handle), |
base::Bind(&DataSourceTest::CanWriteData, base::Unretained(this)), |
base::Bind(&DataSourceTest::OnError, base::Unretained(this))); |
- receiver_ = |
- new DataReceiver(source_sender_handle.Pass(), |
- source_sender_client_request.Pass(), 100, kFatalError); |
+ receiver_ = new DataReceiver(std::move(source_sender_handle), |
+ std::move(source_sender_client_request), 100, |
+ kFatalError); |
} |
void TearDown() override { |
@@ -101,7 +102,7 @@ class DataSourceTest : public testing::Test { |
void OnDataReceived(scoped_ptr<ReadOnlyBuffer> buffer) { |
ASSERT_TRUE(buffer); |
error_ = 0; |
- buffer_ = buffer.Pass(); |
+ buffer_ = std::move(buffer); |
buffer_contents_ = std::string(buffer_->GetData(), buffer_->GetSize()); |
EventReceived(EVENT_RECEIVE_COMPLETE); |
} |
@@ -113,7 +114,7 @@ class DataSourceTest : public testing::Test { |
} |
void CanWriteData(scoped_ptr<WritableBuffer> buffer) { |
- write_buffer_ = buffer.Pass(); |
+ write_buffer_ = std::move(buffer); |
EventReceived(EVENT_WRITE_BUFFER_READY); |
} |