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, 3 insertions, 7 deletions

diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index 746f218..7f20ed6 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -134,13 +134,9 @@ v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Object(
     const DictionaryValue* val) const {
   v8::Handle<v8::Object> result(v8::Object::New());
 
-  for (DictionaryValue::key_iterator iter = val->begin_keys();
-       iter != val->end_keys(); ++iter) {
-    const Value* child = NULL;
-    CHECK(val->GetWithoutPathExpansion(*iter, &child));
-
-    const std::string& key = *iter;
-    v8::Handle<v8::Value> child_v8 = ToV8ValueImpl(child);
+  for (DictionaryValue::Iterator iter(*val); !iter.IsAtEnd(); iter.Advance()) {
+    const std::string& key = iter.key();
+    v8::Handle<v8::Value> child_v8 = ToV8ValueImpl(&iter.value());
     CHECK(!child_v8.IsEmpty());
 
     v8::TryCatch try_catch;