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

Unified Diff: third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc

Issue 1545333002: Convert Pass()→std::move() in //third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
index 9300462312e2e76835b170f2d70ae226c200b834..08c4bdb78320d8e5c903126acc324e859e17bbcf 100644
--- a/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
@@ -5,8 +5,8 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-
#include <string>
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -45,11 +45,11 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
embedder::SimplePlatformSupport platform_support;
test::ChannelThread channel_thread(&platform_support);
embedder::ScopedPlatformHandle client_platform_handle =
- mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
+ std::move(mojo::test::MultiprocessTestHelper::client_platform_handle);
CHECK(client_platform_handle.is_valid());
scoped_refptr<ChannelEndpoint> ep;
scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep));
- channel_thread.Start(client_platform_handle.Pass(), ep);
+ channel_thread.Start(std::move(client_platform_handle), ep);
const std::string quitquitquit("quitquitquit");
int rv = 0;
@@ -208,11 +208,11 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckSharedBuffer) {
embedder::SimplePlatformSupport platform_support;
test::ChannelThread channel_thread(&platform_support);
embedder::ScopedPlatformHandle client_platform_handle =
- mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
+ std::move(mojo::test::MultiprocessTestHelper::client_platform_handle);
CHECK(client_platform_handle.is_valid());
scoped_refptr<ChannelEndpoint> ep;
scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep));
- channel_thread.Start(client_platform_handle.Pass(), ep);
+ channel_thread.Start(std::move(client_platform_handle), ep);
// Wait for the first message from our parent.
HandleSignalsState hss;
@@ -390,11 +390,11 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckPlatformHandleFile) {
embedder::SimplePlatformSupport platform_support;
test::ChannelThread channel_thread(&platform_support);
embedder::ScopedPlatformHandle client_platform_handle =
- mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
+ std::move(mojo::test::MultiprocessTestHelper::client_platform_handle);
CHECK(client_platform_handle.is_valid());
scoped_refptr<ChannelEndpoint> ep;
scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep));
- channel_thread.Start(client_platform_handle.Pass(), ep);
+ channel_thread.Start(std::move(client_platform_handle), ep);
HandleSignalsState hss;
CHECK_EQ(test::WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE, &hss),
@@ -427,11 +427,11 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckPlatformHandleFile) {
scoped_refptr<PlatformHandleDispatcher> dispatcher(
static_cast<PlatformHandleDispatcher*>(dispatchers[i].get()));
- embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle().Pass();
+ embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle();
CHECK(h.is_valid());
dispatcher->Close();
- base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(h.Pass(), "r"));
+ base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(std::move(h), "r"));
CHECK(fp);
std::string fread_buffer(100, '\0');
size_t bytes_read =
@@ -472,7 +472,7 @@ TEST_P(MultiprocessMessagePipeTestWithPipeCount, PlatformHandlePassing) {
scoped_refptr<PlatformHandleDispatcher> dispatcher =
PlatformHandleDispatcher::Create(embedder::ScopedPlatformHandle(
- mojo::test::PlatformHandleFromFILE(fp.Pass())));
+ mojo::test::PlatformHandleFromFILE(std::move(fp))));
dispatchers.push_back(dispatcher);
DispatcherTransport transport(
test::DispatcherTryStartTransport(dispatcher.get()));

Powered by Google App Engine
This is Rietveld 408576698