Convert extensions code using DictionaryValue::key_iterator and

chrome/browser/extensions/settings/syncable_settings_storage.cc

 // Copyright (c) 2011 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/settings/syncable_settings_storage.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/settings/settings_sync_util.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h"
@@ skipping 130 matching lines @@
   }
   return OverwriteLocalSettingsWithSync(sync_state, maybe_settings.settings());
 }
 
 SyncError SyncableSettingsStorage::SendLocalSettingsToSync(
     const DictionaryValue& settings) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(sync_processor_);
 
   SyncChangeList changes;
-  for (DictionaryValue::key_iterator it = settings.begin_keys();
-      it != settings.end_keys(); ++it) {
-    Value* value;
-    settings.GetWithoutPathExpansion(*it, &value);
+  for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) {
     changes.push_back(
-        settings_sync_util::CreateAdd(extension_id_, *it, *value));
+        settings_sync_util::CreateAdd(extension_id_, it.key(), it.value()));
   }
 
   if (changes.empty()) {
     return SyncError();
   }
 
   SyncError error = sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
   if (error.IsSet()) {
     StopSyncing();
     return error;
   }
 
   for (DictionaryValue::key_iterator it = settings.begin_keys();
       it != settings.end_keys(); ++it) {
     synced_keys_.insert(*it);
   }
   return SyncError();
 }
 
 SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync(
     const DictionaryValue& sync_state, const 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<DictionaryValue> new_sync_state(sync_state.DeepCopy());
 
   SettingSyncDataList changes;
-  for (DictionaryValue::key_iterator it = settings.begin_keys();
-      it != settings.end_keys(); ++it) {
+  for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) {
     Value* orphaned_sync_value = NULL;
-    if (new_sync_state->RemoveWithoutPathExpansion(*it, &orphaned_sync_value)) {
+    if (new_sync_state->RemoveWithoutPathExpansion(
+          it.key(), &orphaned_sync_value)) {
       scoped_ptr<Value> sync_value(orphaned_sync_value);
-      Value* local_value = NULL;
-      settings.GetWithoutPathExpansion(*it, &local_value);
-      if (sync_value->Equals(local_value)) {
+      if (sync_value->Equals(&it.value())) {
         // Sync and local values are the same, no changes to send.
-        synced_keys_.insert(*it);
+        synced_keys_.insert(it.key());
       } else {
         // Sync value is different, update local setting with new value.
         changes.push_back(
             SettingSyncData(
                 SyncChange::ACTION_UPDATE,
                 extension_id_,
-                *it,
+                it.key(),
                 sync_value.release()));
       }
     } else {
       // Not synced, delete local setting.
       changes.push_back(
           SettingSyncData(
               SyncChange::ACTION_DELETE,
               extension_id_,
-              *it,
+              it.key(),
               new DictionaryValue()));
     }
   }
 
   // Add all new settings to local settings.
   while (!new_sync_state->empty()) {
     std::string key = *new_sync_state->begin_keys();
     Value* value = NULL;
     CHECK(new_sync_state->RemoveWithoutPathExpansion(key, &value));
     changes.push_back(
@@ skipping 218 matching lines @@
         FROM_HERE,
         std::string("Error pushing sync remove to local settings: ") +
             result.error(),
         sync_type_);
   }
   changes->push_back(SettingChange(key, old_value, NULL));
   return SyncError();
 }
 
 }  // namespace extensions