Convert extensions code using DictionaryValue::key_iterator and

GetWithoutPathExpansion to DictionaryValue::Iterator.


BUG=
TEST=*Extension*


Review URL: http://codereview.chromium.org/8501036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111345 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 13 deletions

diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 9241264..ebe337c 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1679,25 +1679,17 @@ void ExtensionPrefs::InitPrefStore(bool extensions_disabled) {
 
     // Set regular extension controlled prefs.
     const DictionaryValue* prefs = GetExtensionControlledPrefs(*ext_id, false);
-    for (DictionaryValue::key_iterator i = prefs->begin_keys();
-         i != prefs->end_keys(); ++i) {
-      Value* value;
-      if (!prefs->GetWithoutPathExpansion(*i, &value))
-        continue;
+    for (DictionaryValue::Iterator i(*prefs); i.HasNext(); i.Advance()) {
       extension_pref_value_map_->SetExtensionPref(
-          *ext_id, *i, kExtensionPrefsScopeRegular, value->DeepCopy());
+          *ext_id, i.key(), kExtensionPrefsScopeRegular, i.value().DeepCopy());
     }
 
     // Set incognito extension controlled prefs.
     prefs = GetExtensionControlledPrefs(*ext_id, true);
-    for (DictionaryValue::key_iterator i = prefs->begin_keys();
-         i != prefs->end_keys(); ++i) {
-      Value* value;
-      if (!prefs->GetWithoutPathExpansion(*i, &value))
-        continue;
+    for (DictionaryValue::Iterator i(*prefs); i.HasNext(); i.Advance()) {
       extension_pref_value_map_->SetExtensionPref(
-          *ext_id, *i, kExtensionPrefsScopeIncognitoPersistent,
-          value->DeepCopy());
+          *ext_id, i.key(), kExtensionPrefsScopeIncognitoPersistent,
+          i.value().DeepCopy());
     }
 
     // Set content settings.