Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

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 "chrome/browser/extensions/api/storage/settings_namespace.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"
@@ skipping 164 matching lines @@
 syncer::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync(
     const base::DictionaryValue& sync_state,
     const base::DictionaryValue& settings) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // Treat this as a list of changes to sync and use ProcessSyncChanges.
   // This gives notifications etc for free.
   scoped_ptr<base::DictionaryValue> new_sync_state(sync_state.DeepCopy());
 
   SettingSyncDataList changes;
   for (base::DictionaryValue::Iterator it(settings); !it.IsAtEnd(); it.Advance()) {
-    Value* orphaned_sync_value = NULL;
-    if (new_sync_state->RemoveWithoutPathExpansion(
-          it.key(), &orphaned_sync_value)) {
-      scoped_ptr<Value> sync_value(orphaned_sync_value);
+    scoped_ptr<Value> sync_value;
+    if (new_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(
             SettingSyncData(
                 syncer::SyncChange::ACTION_UPDATE,
                 extension_id_,
                 it.key(),
                 sync_value.Pass()));
       }
     } else {
       // Not synced, delete local setting.
       changes.push_back(
           SettingSyncData(
               syncer::SyncChange::ACTION_DELETE,
               extension_id_,
               it.key(),
               scoped_ptr<Value>(new base::DictionaryValue())));
     }
   }
 
   // Add all new settings to local settings.
   while (!new_sync_state->empty()) {
     base::DictionaryValue::Iterator first_entry(*new_sync_state);
     std::string key = first_entry.key();
-    Value* value = NULL;
+    scoped_ptr<Value> value;
     CHECK(new_sync_state->RemoveWithoutPathExpansion(key, &value));
     changes.push_back(
         SettingSyncData(
             syncer::SyncChange::ACTION_ADD,
             extension_id_,
             key,
-            make_scoped_ptr(value)));
+            value.Pass()));
   }
 
   if (changes.empty())
     return syncer::SyncError();
 
   return ProcessSyncChanges(changes);
 }
 
 void SyncableSettingsStorage::StopSyncing() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 150 matching lines @@
         syncer::SyncError::DATATYPE_ERROR,
         std::string("Error pushing sync remove to local settings: ") +
             result->error(),
         sync_processor_->type());
   }
   changes->push_back(ValueStoreChange(key, old_value, NULL));
   return syncer::SyncError();
 }
 
 }  // namespace extensions