Replaced DictionaryValue::key_iterator by DictionaryValue::Iterator outside of chrome/browser.

Marked Iterator::HasNext() as deprecated and added a method Iterator::CanAdvance() as replacement.

As DictionaryValue::Iterator is actually a const iterator, I had to add several missing const annotations, mostly, in json_schema_validator.* and command.*

BUG=162611
TEST=No new tests. Only semantically equivalent refactorings.

Review URL: https://chromiumcodereview.appspot.com/11418150

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

1 files changed, 9 insertions, 29 deletions

diff --git a/chrome/test/ui/javascript_test_util.cc b/chrome/test/ui/javascript_test_util.cc
index 5f97123..e9bd237 100644
--- a/chrome/test/ui/javascript_test_util.cc
+++ b/chrome/test/ui/javascript_test_util.cc
@@ -30,37 +30,17 @@ bool JsonDictionaryToMap(const std::string& json,
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(root.get());
 
-  for (DictionaryValue::key_iterator it = dict->begin_keys();
-       it != dict->end_keys(); ++it) {
-    Value* value = NULL;
-    bool succeeded = dict->GetWithoutPathExpansion(*it, &value);
-
-    EXPECT_TRUE(succeeded);
-    if (!succeeded)
-      continue;
-
-    const std::string& key(*it);
+  for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
+    double double_result;
     std::string result;
-
-    switch (value->GetType()) {
-      case Value::TYPE_STRING:
-        succeeded = value->GetAsString(&result);
-        break;
-      case Value::TYPE_DOUBLE: {
-        double double_result;
-        succeeded = value->GetAsDouble(&double_result);
-        if (succeeded)
-          result = base::DoubleToString(double_result);
-        break;
-      }
-      default:
-        NOTREACHED() << "Value type not supported!";
-        return false;
+    if (it.value().GetAsString(&result)) {
+    } else if (it.value().GetAsDouble(&double_result)) {
+      result = base::DoubleToString(double_result);
+    } else {
+      NOTREACHED() << "Value type not supported!";
+      return false;
     }
-
-    EXPECT_TRUE(succeeded);
-    if (succeeded)
-      results->insert(std::make_pair(key, result));
+    results->insert(std::make_pair(it.key(), result));
   }
 
   return true;