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

Unified Diff: mojo/public/cpp/bindings/lib/control_message_proxy.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/lib/control_message_proxy.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index b623ea75ea8c27d3e3909e24b06be0f919758b71..de091ff5d413cf703085620f8ed9af9310400784 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -4,6 +4,8 @@
#include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
+#include <utility>
+
#include "mojo/public/cpp/bindings/lib/message_builder.h"
#include "mojo/public/cpp/bindings/message.h"
#include "mojo/public/cpp/system/macros.h"
@@ -36,7 +38,7 @@ bool RunResponseForwardToCallback::Accept(Message* message) {
RunResponseMessageParamsPtr params_ptr;
Deserialize_(params, &params_ptr, nullptr);
- callback_.Run(params_ptr->query_version_result.Pass());
+ callback_.Run(std::move(params_ptr->query_version_result));
return true;
}
@@ -46,13 +48,13 @@ void SendRunMessage(MessageReceiverWithResponder* receiver,
RunMessageParamsPtr params_ptr(RunMessageParams::New());
params_ptr->reserved0 = 16u;
params_ptr->reserved1 = 0u;
- params_ptr->query_version = query_version.Pass();
+ params_ptr->query_version = std::move(query_version);
size_t size = GetSerializedSize_(params_ptr);
RequestMessageBuilder builder(kRunMessageId, size);
RunMessageParams_Data* params = nullptr;
- Serialize_(params_ptr.Pass(), builder.buffer(), &params);
+ Serialize_(std::move(params_ptr), builder.buffer(), &params);
params->EncodePointersAndHandles(builder.message()->mutable_handles());
MessageReceiver* responder = new RunResponseForwardToCallback(callback);
if (!receiver->AcceptWithResponder(builder.message(), responder))
@@ -64,13 +66,13 @@ void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
params_ptr->reserved0 = 16u;
params_ptr->reserved1 = 0u;
- params_ptr->require_version = require_version.Pass();
+ params_ptr->require_version = std::move(require_version);
size_t size = GetSerializedSize_(params_ptr);
MessageBuilder builder(kRunOrClosePipeMessageId, size);
RunOrClosePipeMessageParams_Data* params = nullptr;
- Serialize_(params_ptr.Pass(), builder.buffer(), &params);
+ Serialize_(std::move(params_ptr), builder.buffer(), &params);
params->EncodePointersAndHandles(builder.message()->mutable_handles());
bool ok = receiver->Accept(builder.message());
MOJO_ALLOW_UNUSED_LOCAL(ok);
@@ -93,7 +95,7 @@ void ControlMessageProxy::QueryVersion(
void ControlMessageProxy::RequireVersion(uint32_t version) {
RequireVersionPtr require_version(RequireVersion::New());
require_version->version = version;
- SendRunOrClosePipeMessage(receiver_, require_version.Pass());
+ SendRunOrClosePipeMessage(receiver_, std::move(require_version));
}
} // namespace internal

Powered by Google App Engine
This is Rietveld 408576698