Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: mojo/public/cpp/bindings/tests/connector_unittest.cc

Issue 1535943002: Convert Pass()→std::move() in //mojo/public/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove self-move checks to avoid triggering clang warning. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/bindings/tests/connector_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc
index 31125e8553f09398c5ff6274331ca0feb098f5e6..1def73d84d06cc8a65f24fcc4e01c97f2f59ae42 100644
--- a/mojo/public/cpp/bindings/tests/connector_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include <string.h>
+#include <utility>
#include "base/message_loop/message_loop.h"
#include "mojo/message_pump/message_pump_mojo.h"
@@ -100,9 +101,9 @@ class ConnectorTest : public testing::Test {
};
TEST_F(ConnectorTest, Basic) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char kText[] = "hello world";
@@ -128,9 +129,9 @@ TEST_F(ConnectorTest, Basic) {
}
TEST_F(ConnectorTest, Basic_Synchronous) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char kText[] = "hello world";
@@ -156,9 +157,9 @@ TEST_F(ConnectorTest, Basic_Synchronous) {
}
TEST_F(ConnectorTest, Basic_EarlyIncomingReceiver) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
MessageAccumulator accumulator;
@@ -184,9 +185,9 @@ TEST_F(ConnectorTest, Basic_EarlyIncomingReceiver) {
}
TEST_F(ConnectorTest, Basic_TwoMessages) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char* kText[] = {"hello", "world"};
@@ -216,9 +217,9 @@ TEST_F(ConnectorTest, Basic_TwoMessages) {
}
TEST_F(ConnectorTest, Basic_TwoMessages_Synchronous) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char* kText[] = {"hello", "world"};
@@ -248,7 +249,7 @@ TEST_F(ConnectorTest, Basic_TwoMessages_Synchronous) {
}
TEST_F(ConnectorTest, WriteToClosedPipe) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
const char kText[] = "hello world";
@@ -276,9 +277,9 @@ TEST_F(ConnectorTest, WriteToClosedPipe) {
}
TEST_F(ConnectorTest, MessageWithHandles) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char kText[] = "hello world";
@@ -318,9 +319,9 @@ TEST_F(ConnectorTest, MessageWithHandles) {
// |smph| now owns this handle.
internal::Connector connector_received(
- smph.Pass(), internal::Connector::SINGLE_THREADED_SEND);
+ std::move(smph), internal::Connector::SINGLE_THREADED_SEND);
internal::Connector connector_original(
- pipe.handle1.Pass(), internal::Connector::SINGLE_THREADED_SEND);
+ std::move(pipe.handle1), internal::Connector::SINGLE_THREADED_SEND);
Message message2;
AllocMessage(kText, &message2);
@@ -339,7 +340,7 @@ TEST_F(ConnectorTest, MessageWithHandles) {
}
TEST_F(ConnectorTest, WaitForIncomingMessageWithError) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
// Close the other end of the pipe.
handle1_.reset();
@@ -347,10 +348,10 @@ TEST_F(ConnectorTest, WaitForIncomingMessageWithError) {
}
TEST_F(ConnectorTest, WaitForIncomingMessageWithDeletion) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
internal::Connector* connector1 = new internal::Connector(
- handle1_.Pass(), internal::Connector::SINGLE_THREADED_SEND);
+ std::move(handle1_), internal::Connector::SINGLE_THREADED_SEND);
const char kText[] = "hello world";
@@ -376,9 +377,9 @@ TEST_F(ConnectorTest, WaitForIncomingMessageWithDeletion) {
}
TEST_F(ConnectorTest, WaitForIncomingMessageWithReentrancy) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
const char* kText[] = {"hello", "world"};
@@ -410,13 +411,13 @@ TEST_F(ConnectorTest, WaitForIncomingMessageWithReentrancy) {
}
TEST_F(ConnectorTest, RaiseError) {
- internal::Connector connector0(handle0_.Pass(),
+ internal::Connector connector0(std::move(handle0_),
internal::Connector::SINGLE_THREADED_SEND);
bool error_handler_called0 = false;
connector0.set_connection_error_handler(
[&error_handler_called0]() { error_handler_called0 = true; });
- internal::Connector connector1(handle1_.Pass(),
+ internal::Connector connector1(std::move(handle1_),
internal::Connector::SINGLE_THREADED_SEND);
bool error_handler_called1 = false;
connector1.set_connection_error_handler(

Powered by Google App Engine
This is Rietveld 408576698