| 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) {
|
|
|