Removing base::DictionaryValue::key_iterator.

chrome/browser/policy/component_cloud_policy_store.cc

 // Copyright (c) 2013 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/policy/component_cloud_policy_store.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
@@ skipping 297 matching lines @@
       data, base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN));
   base::DictionaryValue* dict = NULL;
   if (!json || !json->GetAsDictionary(&dict))
     return false;
 
   // Each top-level key maps a policy name to its description.
   //
   // Each description is an object that contains the policy value under the
   // "Value" key. The optional "Level" key is either "Mandatory" (default) or
   // "Recommended".
-  for (base::DictionaryValue::key_iterator it = dict->begin_keys();
-       it != dict->end_keys(); ++it) {
+  for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     base::DictionaryValue* description = NULL;
-    if (!dict->GetDictionary(*it, &description))
+    if (!dict->GetDictionaryWithoutPathExpansion(it.key(), &description))
       return false;
 
     base::Value* value = NULL;
-    if (!description->Remove(kValue, &value))
+    if (!description->RemoveWithoutPathExpansion(kValue, &value))
       return false;
 
     PolicyLevel level = POLICY_LEVEL_MANDATORY;
     std::string level_string;
-    if (description->GetString(kLevel, &level_string) &&
+    if (description->GetStringWithoutPathExpansion(kLevel, &level_string) &&
         level_string == kRecommended) {
       level = POLICY_LEVEL_RECOMMENDED;
     }
 
     // If policy for components is ever used for device-level settings then
     // this must support a configurable scope; assuming POLICY_SCOPE_USER is
     // fine for now.
-    policy->Set(*it, level, POLICY_SCOPE_USER, value);
+    policy->Set(it.key(), level, POLICY_SCOPE_USER, value);
   }
 
   return true;
 }
 
 }  // namespace policy