Removing base::DictionaryValue::key_iterator.

chrome/browser/profiles/profile_info_cache.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/profiles/profile_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 158 matching lines @@
 
 }  // namespace
 
 ProfileInfoCache::ProfileInfoCache(PrefService* prefs,
                                    const base::FilePath& user_data_dir)
     : prefs_(prefs),
       user_data_dir_(user_data_dir) {
   // Populate the cache
   const DictionaryValue* cache =
       prefs_->GetDictionary(prefs::kProfileInfoCache);
-  for (DictionaryValue::key_iterator it = cache->begin_keys();
-       it != cache->end_keys(); ++it) {
-    std::string key = *it;
+  for (DictionaryValue::Iterator it(*cache); !it.IsAtEnd(); it.Advance()) {
     const DictionaryValue* info = NULL;
-    cache->GetDictionary(key, &info);
+    it.value().GetAsDictionary(&info);
     string16 name;
     info->GetString(kNameKey, &name);
-    sorted_keys_.insert(FindPositionForProfile(key, name), key);
+    sorted_keys_.insert(FindPositionForProfile(it.key(), name), it.key());
   }
 }
 
 ProfileInfoCache::~ProfileInfoCache() {
   STLDeleteContainerPairSecondPointers(
       gaia_pictures_.begin(), gaia_pictures_.end());
 }
 
 void ProfileInfoCache::AddProfileToCache(const base::FilePath& profile_path,
                                          const string16& name,
@@ skipping 609 matching lines @@
       content::NotificationService::NoDetails());
 }
 
 // static
 std::vector<string16> ProfileInfoCache::GetProfileNames() {
   std::vector<string16> names;
   PrefService* local_state = g_browser_process->local_state();
   const DictionaryValue* cache = local_state->GetDictionary(
       prefs::kProfileInfoCache);
   string16 name;
-  for (base::DictionaryValue::key_iterator it = cache->begin_keys();
-       it != cache->end_keys();
-       ++it) {
+  for (base::DictionaryValue::Iterator it(*cache); !it.IsAtEnd();
+       it.Advance()) {
     const base::DictionaryValue* info = NULL;
-    cache->GetDictionary(*it, &info);
+    it.value().GetAsDictionary(&info);
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }