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

Unified Diff: components/sync_driver/device_info_sync_service.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers 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: components/sync_driver/device_info_sync_service.cc
diff --git a/components/sync_driver/device_info_sync_service.cc b/components/sync_driver/device_info_sync_service.cc
index 8005e97b6ac5ec48e25f83bba4ab4e7f65a467a7..77eaed42dddaedec9ed8f5f0cb9ab6096c568c63 100644
--- a/components/sync_driver/device_info_sync_service.cc
+++ b/components/sync_driver/device_info_sync_service.cc
@@ -5,6 +5,7 @@
#include "components/sync_driver/device_info_sync_service.h"
#include <stddef.h>
+#include <utility>
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
@@ -77,8 +78,8 @@ SyncMergeResult DeviceInfoSyncService::MergeDataAndStartSyncing(
DCHECK(!IsSyncing());
- sync_processor_ = sync_processor.Pass();
- error_handler_ = error_handler.Pass();
+ sync_processor_ = std::move(sync_processor);
+ error_handler_ = std::move(error_handler);
// Initialization should be completed before this type is enabled
// and local device info must be available.
@@ -268,7 +269,7 @@ ScopedVector<DeviceInfo> DeviceInfoSyncService::GetAllDeviceInfo() const {
list.push_back(CreateDeviceInfo(iter->second));
}
- return list.Pass();
+ return list;
}
void DeviceInfoSyncService::AddObserver(Observer* observer) {
« no previous file with comments | « components/sync_driver/device_info_service.cc ('k') | components/sync_driver/fake_generic_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698