From e486004502c17ab80953ef324926a536b8030d1e Mon Sep 17 00:00:00 2001 From: dcheng Date: Sun, 27 Dec 2015 18:24:50 -0800 Subject: =?UTF-8?q?Global=20conversion=20of=20Pass()=E2=86=92std::move()?= =?UTF-8?q?=20on=20OS=3D=3Dlinux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❆(੭ु ◜◡‾)੭ु⁾☃❆ BUG=557422 R=avi@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1550693002 Cr-Commit-Position: refs/heads/master@{#366956} --- dbus/exported_object.cc | 3 ++- dbus/message.cc | 10 +++++----- dbus/object_proxy.cc | 7 ++++--- dbus/test_service.cc | 22 +++++++++++----------- 4 files changed, 22 insertions(+), 20 deletions(-) (limited to 'dbus') diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc index 3054c35..e4cd1a4 100644 --- a/dbus/exported_object.cc +++ b/dbus/exported_object.cc @@ -5,6 +5,7 @@ #include "dbus/exported_object.h" #include +#include #include "base/bind.h" #include "base/logging.h" @@ -264,7 +265,7 @@ void ExportedObject::SendResponse(base::TimeTicks start_time, base::Passed(&response), start_time)); } else { - OnMethodCompleted(method_call.Pass(), response.Pass(), start_time); + OnMethodCompleted(std::move(method_call), std::move(response), start_time); } } diff --git a/dbus/message.cc b/dbus/message.cc index 2de3861..8a58dba 100644 --- a/dbus/message.cc +++ b/dbus/message.cc @@ -404,19 +404,19 @@ scoped_ptr Response::FromRawMessage(DBusMessage* raw_message) { scoped_ptr response(new Response); response->Init(raw_message); - return response.Pass(); + return response; } scoped_ptr Response::FromMethodCall(MethodCall* method_call) { scoped_ptr response(new Response); response->Init(dbus_message_new_method_return(method_call->raw_message())); - return response.Pass(); + return response; } scoped_ptr Response::CreateEmpty() { scoped_ptr response(new Response); response->Init(dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN)); - return response.Pass(); + return response; } // @@ -432,7 +432,7 @@ scoped_ptr ErrorResponse::FromRawMessage( scoped_ptr response(new ErrorResponse); response->Init(raw_message); - return response.Pass(); + return response; } scoped_ptr ErrorResponse::FromMethodCall( @@ -443,7 +443,7 @@ scoped_ptr ErrorResponse::FromMethodCall( response->Init(dbus_message_new_error(method_call->raw_message(), error_name.c_str(), error_message.c_str())); - return response.Pass(); + return response; } // diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index fc7d199..e7d1f22 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "dbus/bus.h" +#include "dbus/object_proxy.h" #include +#include #include "base/bind.h" #include "base/logging.h" @@ -15,10 +16,10 @@ #include "base/task_runner_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "dbus/bus.h" #include "dbus/dbus_statistics.h" #include "dbus/message.h" #include "dbus/object_path.h" -#include "dbus/object_proxy.h" #include "dbus/scoped_dbus_error.h" #include "dbus/util.h" @@ -476,7 +477,7 @@ DBusHandlerResult ObjectProxy::HandleMessage( if (path.value() == kDBusSystemObjectPath && signal->GetMember() == kNameOwnerChangedMember) { // Handle NameOwnerChanged separately - return HandleNameOwnerChanged(signal.Pass()); + return HandleNameOwnerChanged(std::move(signal)); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } diff --git a/dbus/test_service.cc b/dbus/test_service.cc index 804bb2a..a4e152a 100644 --- a/dbus/test_service.cc +++ b/dbus/test_service.cc @@ -5,8 +5,8 @@ #include "dbus/test_service.h" #include - #include +#include #include #include "base/bind.h" @@ -311,7 +311,7 @@ void TestService::Echo(MethodCall* method_call, scoped_ptr response = Response::FromMethodCall(method_call); MessageWriter writer(response.get()); writer.AppendString(text_message); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::SlowEcho(MethodCall* method_call, @@ -352,7 +352,7 @@ void TestService::GetAllProperties( AddPropertiesToWriter(&writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::GetProperty(MethodCall* method_call, @@ -378,7 +378,7 @@ void TestService::GetProperty(MethodCall* method_call, writer.AppendVariantOfString("TestService"); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Version") { // Return a new value for the "Version" property: // Variant<20> @@ -387,7 +387,7 @@ void TestService::GetProperty(MethodCall* method_call, writer.AppendVariantOfInt16(20); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Methods") { // Return the previous value for the "Methods" property: // Variant<["Echo", "SlowEcho", "AsyncEcho", "BrokenMethod"]> @@ -405,7 +405,7 @@ void TestService::GetProperty(MethodCall* method_call, variant_writer.CloseContainer(&variant_array_writer); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Objects") { // Return the previous value for the "Objects" property: // Variant<[objectpath:"/TestObjectPath"]> @@ -420,7 +420,7 @@ void TestService::GetProperty(MethodCall* method_call, variant_writer.CloseContainer(&variant_array_writer); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Bytes") { // Return the previous value for the "Bytes" property: // Variant<[0x54, 0x65, 0x73, 0x74]> @@ -434,7 +434,7 @@ void TestService::GetProperty(MethodCall* method_call, variant_writer.AppendArrayOfBytes(bytes, sizeof(bytes)); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else { // Return error. response_sender.Run(scoped_ptr()); @@ -505,14 +505,14 @@ void TestService::PerformAction( } scoped_ptr response = Response::FromMethodCall(method_call); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::PerformActionResponse( MethodCall* method_call, ExportedObject::ResponseSender response_sender) { scoped_ptr response = Response::FromMethodCall(method_call); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::OwnershipReleased( @@ -572,7 +572,7 @@ void TestService::GetManagedObjects( array_writer.CloseContainer(&dict_entry_writer); writer.CloseContainer(&array_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); if (send_immediate_properties_changed_) SendPropertyChangedSignal("ChangedTestServiceName"); -- cgit v1.1