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

Unified Diff: components/wifi_sync/wifi_credential_syncable_service.cc

Issue 1917673002: Convert //components/[u-z]* 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/wifi_sync/wifi_credential_syncable_service.cc
diff --git a/components/wifi_sync/wifi_credential_syncable_service.cc b/components/wifi_sync/wifi_credential_syncable_service.cc
index 7550853bbe14ca0b1457440eb13aa8ded8acfa0a..090533e5ad964ebd3a0e03fed221482aaf40c449 100644
--- a/components/wifi_sync/wifi_credential_syncable_service.cc
+++ b/components/wifi_sync/wifi_credential_syncable_service.cc
@@ -107,7 +107,7 @@ const syncer::ModelType WifiCredentialSyncableService::kModelType =
syncer::WIFI_CREDENTIALS;
WifiCredentialSyncableService::WifiCredentialSyncableService(
- scoped_ptr<WifiConfigDelegate> network_config_delegate)
+ std::unique_ptr<WifiConfigDelegate> network_config_delegate)
: network_config_delegate_(std::move(network_config_delegate)) {
DCHECK(network_config_delegate_);
}
@@ -118,8 +118,8 @@ WifiCredentialSyncableService::~WifiCredentialSyncableService() {
syncer::SyncMergeResult WifiCredentialSyncableService::MergeDataAndStartSyncing(
syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
- 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 */) {
DCHECK(!sync_processor_.get());
DCHECK(sync_processor.get());
DCHECK_EQ(kModelType, type);
@@ -165,7 +165,7 @@ syncer::SyncError WifiCredentialSyncableService::ProcessSyncChanges(
continue;
}
- scoped_ptr<WifiCredential> credential;
+ std::unique_ptr<WifiCredential> credential;
switch (sync_change.change_type()) {
case syncer::SyncChange::ACTION_ADD:
credential = WifiCredential::Create(raw_credential.ssid,

Powered by Google App Engine
This is Rietveld 408576698