Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

chrome/browser/extensions/api/storage/syncable_settings_storage.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h"
 
 #include <utility>
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h"
@@ skipping 135 matching lines @@
     // Tell sync to try and start soon, because syncable changes to sync_type_
     // have started happening. This will cause sync to call us back
     // asynchronously via StartSyncing(...) as soon as possible.
     flare_.Run(sync_type_);
   }
 }
 
 // Sync-related methods.
 
 syncer::SyncError SyncableSettingsStorage::StartSyncing(
-    scoped_ptr<base::DictionaryValue> sync_state,
-    scoped_ptr<SettingsSyncProcessor> sync_processor) {
+    std::unique_ptr<base::DictionaryValue> sync_state,
+    std::unique_ptr<SettingsSyncProcessor> sync_processor) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(sync_state);
   DCHECK(!sync_processor_.get());
 
   sync_processor_ = std::move(sync_processor);
   sync_processor_->Init(*sync_state);
 
   ReadResult maybe_settings = delegate_->Get();
   if (!maybe_settings->status().ok()) {
     return syncer::SyncError(
         FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
         base::StringPrintf("Failed to get settings: %s",
                            maybe_settings->status().message.c_str()),
         sync_processor_->type());
   }
 
-  scoped_ptr<base::DictionaryValue> current_settings =
+  std::unique_ptr<base::DictionaryValue> current_settings =
       maybe_settings->PassSettings();
   return sync_state->empty()
              ? SendLocalSettingsToSync(std::move(current_settings))
              : OverwriteLocalSettingsWithSync(std::move(sync_state),
                                               std::move(current_settings));
 }
 
 syncer::SyncError SyncableSettingsStorage::SendLocalSettingsToSync(
-    scoped_ptr<base::DictionaryValue> local_state) {
+    std::unique_ptr<base::DictionaryValue> local_state) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (local_state->empty())
     return syncer::SyncError();
 
   // Transform the current settings into a list of sync changes.
   ValueStoreChangeList changes;
   while (!local_state->empty()) {
     // It's not possible to iterate over a DictionaryValue and modify it at the
     // same time, so hack around that restriction.
     std::string key = base::DictionaryValue::Iterator(*local_state).key();
-    scoped_ptr<base::Value> value;
+    std::unique_ptr<base::Value> value;
     local_state->RemoveWithoutPathExpansion(key, &value);
     changes.push_back(ValueStoreChange(key, nullptr, value.release()));
   }
 
   syncer::SyncError error = sync_processor_->SendChanges(changes);
   if (error.IsSet())
     StopSyncing();
   return error;
 }
 
 syncer::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync(
-    scoped_ptr<base::DictionaryValue> sync_state,
-    scoped_ptr<base::DictionaryValue> local_state) {
+    std::unique_ptr<base::DictionaryValue> sync_state,
+    std::unique_ptr<base::DictionaryValue> local_state) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   // This is implemented by building up a list of sync changes then sending
   // those to ProcessSyncChanges. This generates events like onStorageChanged.
-  scoped_ptr<SettingSyncDataList> changes(new SettingSyncDataList());
+  std::unique_ptr<SettingSyncDataList> changes(new SettingSyncDataList());
 
   for (base::DictionaryValue::Iterator it(*local_state); !it.IsAtEnd();
        it.Advance()) {
-    scoped_ptr<base::Value> sync_value;
+    std::unique_ptr<base::Value> sync_value;
     if (sync_state->RemoveWithoutPathExpansion(it.key(), &sync_value)) {
       if (sync_value->Equals(&it.value())) {
         // Sync and local values are the same, no changes to send.
       } else {
         // Sync value is different, update local setting with new value.
         changes->push_back(new SettingSyncData(
             syncer::SyncChange::ACTION_UPDATE, extension_id_, it.key(),
             std::move(sync_value)));
       }
     } else {
       // Not synced, delete local setting.
       changes->push_back(new SettingSyncData(
           syncer::SyncChange::ACTION_DELETE, extension_id_, it.key(),
-          scoped_ptr<base::Value>(new base::DictionaryValue())));
+          std::unique_ptr<base::Value>(new base::DictionaryValue())));
     }
   }
 
   // Add all new settings to local settings.
   while (!sync_state->empty()) {
     // It's not possible to iterate over a DictionaryValue and modify it at the
     // same time, so hack around that restriction.
     std::string key = base::DictionaryValue::Iterator(*sync_state).key();
-    scoped_ptr<base::Value> value;
+    std::unique_ptr<base::Value> value;
     CHECK(sync_state->RemoveWithoutPathExpansion(key, &value));
     changes->push_back(new SettingSyncData(
         syncer::SyncChange::ACTION_ADD, extension_id_, key, std::move(value)));
   }
 
   if (changes->empty())
     return syncer::SyncError();
   return ProcessSyncChanges(std::move(changes));
 }
 
 void SyncableSettingsStorage::StopSyncing() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   sync_processor_.reset();
 }
 
 syncer::SyncError SyncableSettingsStorage::ProcessSyncChanges(
-    scoped_ptr<SettingSyncDataList> sync_changes) {
+    std::unique_ptr<SettingSyncDataList> sync_changes) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(!sync_changes->empty()) << "No sync changes for " << extension_id_;
 
   if (!sync_processor_.get()) {
     return syncer::SyncError(
         FROM_HERE,
         syncer::SyncError::DATATYPE_ERROR,
         std::string("Sync is inactive for ") + extension_id_,
         syncer::UNSPECIFIED);
   }
 
   std::vector<syncer::SyncError> errors;
   ValueStoreChangeList changes;
 
   for (SettingSyncDataList::iterator it = sync_changes->begin();
        it != sync_changes->end(); ++it) {
     DCHECK_EQ(extension_id_, (*it)->extension_id());
     const std::string& key = (*it)->key();
-    scoped_ptr<base::Value> change_value = (*it)->PassValue();
+    std::unique_ptr<base::Value> change_value = (*it)->PassValue();
 
-    scoped_ptr<base::Value> current_value;
+    std::unique_ptr<base::Value> current_value;
     {
       ReadResult maybe_settings = Get(key);
       if (!maybe_settings->status().ok()) {
         errors.push_back(syncer::SyncError(
             FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
             base::StringPrintf("Error getting current sync state for %s/%s: %s",
                                extension_id_.c_str(), key.c_str(),
                                maybe_settings->status().message.c_str()),
             sync_processor_->type()));
         continue;
@@ skipping 108 matching lines @@
         FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
         base::StringPrintf("Error pushing sync remove to local settings: %s",
                            result->status().message.c_str()),
         sync_processor_->type());
   }
   changes->push_back(ValueStoreChange(key, old_value, NULL));
   return syncer::SyncError();
 }
 
 }  // namespace extensions