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

Unified Diff: chromeos/dbus/services/cros_dbus_service.cc

Issue 1556773002: Convert Pass()→std::move() in //chromeos (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: chromeos/dbus/services/cros_dbus_service.cc
diff --git a/chromeos/dbus/services/cros_dbus_service.cc b/chromeos/dbus/services/cros_dbus_service.cc
index 6f482ac5dc4e02f6717046beb6677f3ec1297411..672bc862f805dc174dbe5d93d65f9552143474a7 100644
--- a/chromeos/dbus/services/cros_dbus_service.cc
+++ b/chromeos/dbus/services/cros_dbus_service.cc
@@ -5,6 +5,7 @@
#include "chromeos/dbus/services/cros_dbus_service.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/stl_util.h"
@@ -31,8 +32,7 @@ class CrosDBusServiceImpl : public CrosDBusService {
: service_started_(false),
origin_thread_id_(base::PlatformThread::CurrentId()),
bus_(bus),
- service_providers_(service_providers.Pass()) {
- }
+ service_providers_(std::move(service_providers)) {}
~CrosDBusServiceImpl() override {
}
@@ -111,7 +111,7 @@ void CrosDBusService::Initialize(
}
dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus();
if (base::SysInfo::IsRunningOnChromeOS() && bus) {
- auto* service = new CrosDBusServiceImpl(bus, service_providers.Pass());
+ auto* service = new CrosDBusServiceImpl(bus, std::move(service_providers));
g_cros_dbus_service = service;
service->Start();
} else {
@@ -128,7 +128,7 @@ void CrosDBusService::InitializeForTesting(
LOG(WARNING) << "CrosDBusService was already initialized";
return;
}
- auto* service = new CrosDBusServiceImpl(bus, service_providers.Pass());
+ auto* service = new CrosDBusServiceImpl(bus, std::move(service_providers));
service->Start();
g_cros_dbus_service = service;
VLOG(1) << "CrosDBusService initialized";
« no previous file with comments | « chromeos/dbus/services/console_service_provider.cc ('k') | chromeos/dbus/services/cros_dbus_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698