Convert Pass()→std::move() in //chrome/browser/extensions

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"
 #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/storage/settings_namespace.h"
 #include "sync/api/sync_data.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 
 using content::BrowserThread;
 
@@ skipping 63 matching lines @@
 ValueStore::ReadResult SyncableSettingsStorage::Get() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   return HandleResult(delegate_->Get());
 }
 
 ValueStore::WriteResult SyncableSettingsStorage::Set(
     WriteOptions options, const std::string& key, const base::Value& value) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   WriteResult result = HandleResult(delegate_->Set(options, key, value));
   if (!result->status().ok())
-    return result.Pass();
+    return result;
   SyncResultIfEnabled(result);
-  return result.Pass();
+  return result;
 }
 
 ValueStore::WriteResult SyncableSettingsStorage::Set(
     WriteOptions options, const base::DictionaryValue& values) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   WriteResult result = HandleResult(delegate_->Set(options, values));
   if (!result->status().ok())
-    return result.Pass();
+    return result;
   SyncResultIfEnabled(result);
-  return result.Pass();
+  return result;
 }
 
 ValueStore::WriteResult SyncableSettingsStorage::Remove(
     const std::string& key) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   WriteResult result = HandleResult(delegate_->Remove(key));
   if (!result->status().ok())
-    return result.Pass();
+    return result;
   SyncResultIfEnabled(result);
-  return result.Pass();
+  return result;
 }
 
 ValueStore::WriteResult SyncableSettingsStorage::Remove(
     const std::vector<std::string>& keys) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   WriteResult result = HandleResult(delegate_->Remove(keys));
   if (!result->status().ok())
-    return result.Pass();
+    return result;
   SyncResultIfEnabled(result);
-  return result.Pass();
+  return result;
 }
 
 ValueStore::WriteResult SyncableSettingsStorage::Clear() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   WriteResult result = HandleResult(delegate_->Clear());
   if (!result->status().ok())
-    return result.Pass();
+    return result;
   SyncResultIfEnabled(result);
-  return result.Pass();
+  return result;
 }
 
 void SyncableSettingsStorage::SyncResultIfEnabled(
     const ValueStore::WriteResult& result) {
   if (result->changes().empty())
     return;
 
   if (sync_processor_.get()) {
     syncer::SyncError error = sync_processor_->SendChanges(result->changes());
     if (error.IsSet())
       StopSyncing();
   } else {
     // 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) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(sync_state);
   DCHECK(!sync_processor_.get());
 
-  sync_processor_ = sync_processor.Pass();
+  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 =
       maybe_settings->PassSettings();
-  return sync_state->empty() ? SendLocalSettingsToSync(current_settings.Pass())
-                             : OverwriteLocalSettingsWithSync(
-                                   sync_state.Pass(), current_settings.Pass());
+  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) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (local_state->empty())
     return syncer::SyncError();
 
   // Transform the current settings into a list of sync changes.
@@ skipping 22 matching lines @@
   scoped_ptr<SettingSyncDataList> changes(new SettingSyncDataList());
 
   for (base::DictionaryValue::Iterator it(*local_state); !it.IsAtEnd();
        it.Advance()) {
     scoped_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(), sync_value.Pass()));
+        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())));
     }
   }
 
   // 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;
     CHECK(sync_state->RemoveWithoutPathExpansion(key, &value));
-    changes->push_back(new SettingSyncData(syncer::SyncChange::ACTION_ADD,
-                                           extension_id_, key, value.Pass()));
+    changes->push_back(new SettingSyncData(
+        syncer::SyncChange::ACTION_ADD, extension_id_, key, std::move(value)));
   }
 
   if (changes->empty())
     return syncer::SyncError();
-  return ProcessSyncChanges(changes.Pass());
+  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) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
@@ skipping 138 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