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

Unified Diff: components/sync_driver/device_info_sync_service.h

Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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.h
diff --git a/components/sync_driver/device_info_sync_service.h b/components/sync_driver/device_info_sync_service.h
index fd75beab267efdffa6003e9b94e84c92eed670bf..5cf2a6a0f7e91e35ce6d557f95d0b8b341353288 100644
--- a/components/sync_driver/device_info_sync_service.h
+++ b/components/sync_driver/device_info_sync_service.h
@@ -8,10 +8,10 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/observer_list.h"
#include "base/time/time.h"
@@ -46,8 +46,8 @@ class DeviceInfoSyncService : public syncer::SyncableService,
syncer::SyncMergeResult MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
- scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) override;
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
@@ -56,7 +56,7 @@ class DeviceInfoSyncService : public syncer::SyncableService,
// DeviceInfoTracker implementation.
bool IsSyncing() const override;
- scoped_ptr<DeviceInfo> GetDeviceInfo(
+ std::unique_ptr<DeviceInfo> GetDeviceInfo(
const std::string& client_id) const override;
ScopedVector<DeviceInfo> GetAllDeviceInfo() const override;
void AddObserver(Observer* observer) override;
@@ -114,8 +114,8 @@ class DeviceInfoSyncService : public syncer::SyncableService,
// Receives ownership of |sync_processor_| and |error_handler_| in
// MergeDataAndStartSyncing() and destroy them in StopSyncing().
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
- scoped_ptr<syncer::SyncErrorFactory> error_handler_;
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler_;
// Cache of all syncable and local data.
typedef std::map<std::string, syncer::SyncData> SyncDataMap;

Powered by Google App Engine
This is Rietveld 408576698