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

2 files changed, 21 insertions, 28 deletions

diff --git a/chrome/test/webdriver/webdriver_capabilities_parser.cc b/chrome/test/webdriver/webdriver_capabilities_parser.cc
index d8e793b..9617f6c0 100644
--- a/chrome/test/webdriver/webdriver_capabilities_parser.cc
+++ b/chrome/test/webdriver/webdriver_capabilities_parser.cc
@@ -127,21 +127,20 @@ Error* CapabilitiesParser::Parse() {
         &CapabilitiesParser::ParseExcludeSwitches;
   }
 
-  DictionaryValue::key_iterator key_iter = options->begin_keys();
-  for (; key_iter != options->end_keys(); ++key_iter) {
-    if (parser_map.find(*key_iter) == parser_map.end()) {
+  for (DictionaryValue::Iterator iter(*options); !iter.IsAtEnd();
+       iter.Advance()) {
+    if (parser_map.find(iter.key()) == parser_map.end()) {
       if (!legacy_options)
         return new Error(kBadRequest,
-                         "Unrecognized chrome capability: " +  *key_iter);
+                         "Unrecognized chrome capability: " + iter.key());
       continue;
     }
-    const Value* option = NULL;
-    options->GetWithoutPathExpansion(*key_iter, &option);
-    Error* error = (this->*parser_map[*key_iter])(option);
+    const Value* option = &iter.value();
+    Error* error = (this->*parser_map[iter.key()])(option);
     if (error) {
       error->AddDetails(base::StringPrintf(
           "Error occurred while processing capability '%s'",
-          (*key_iter).c_str()));
+          iter.key().c_str()));
       return error;
     }
   }
@@ -235,20 +234,18 @@ Error* CapabilitiesParser::ParseLoggingPrefs(const base::Value* option) {
   if (!option->GetAsDictionary(&logging_prefs))
     return CreateBadInputError("loggingPrefs", Value::TYPE_DICTIONARY, option);
 
-  DictionaryValue::key_iterator key_iter = logging_prefs->begin_keys();
-  for (; key_iter != logging_prefs->end_keys(); ++key_iter) {
+  for (DictionaryValue::Iterator iter(*logging_prefs); !iter.IsAtEnd();
+       iter.Advance()) {
     LogType log_type;
-    if (!LogType::FromString(*key_iter, &log_type))
+    if (!LogType::FromString(iter.key(), &log_type))
       continue;
 
-    const Value* level_value;
-    logging_prefs->Get(*key_iter, &level_value);
     std::string level_name;
-    if (!level_value->GetAsString(&level_name)) {
+    if (!iter.value().GetAsString(&level_name)) {
       return CreateBadInputError(
-          std::string("loggingPrefs.") + *key_iter,
+          std::string("loggingPrefs.") + iter.key(),
           Value::TYPE_STRING,
-          level_value);
+          &iter.value());
     }
     caps_->log_levels[log_type.type()] = LogLevelFromString(level_name);
   }
diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc
index 55d718e..6f303b5 100644
--- a/chrome/test/webdriver/webdriver_session.cc
+++ b/chrome/test/webdriver/webdriver_session.cc
@@ -1924,21 +1924,17 @@ Error* Session::InitForWebsiteTesting() {
 }
 
 Error* Session::SetPrefs() {
-  DictionaryValue::key_iterator iter = capabilities_.prefs->begin_keys();
-  for (; iter != capabilities_.prefs->end_keys(); ++iter) {
-    Value* value;
-    capabilities_.prefs->GetWithoutPathExpansion(*iter, &value);
-    Error* error = SetPreference(*iter, true /* is_user_pref */,
-                                 value->DeepCopy());
+  for (DictionaryValue::Iterator iter(*capabilities_.prefs); !iter.IsAtEnd();
+       iter.Advance()) {
+    Error* error = SetPreference(iter.key(), true /* is_user_pref */,
+                                 iter.value().DeepCopy());
     if (error)
       return error;
   }
-  iter = capabilities_.local_state->begin_keys();
-  for (; iter != capabilities_.local_state->end_keys(); ++iter) {
-    Value* value;
-    capabilities_.local_state->GetWithoutPathExpansion(*iter, &value);
-    Error* error = SetPreference(*iter, false /* is_user_pref */,
-                                 value->DeepCopy());
+  for (DictionaryValue::Iterator iter(*capabilities_.local_state);
+       !iter.IsAtEnd(); iter.Advance()) {
+    Error* error = SetPreference(iter.key(), false /* is_user_pref */,
+                                 iter.value().DeepCopy());
     if (error)
       return error;
   }