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, 6 insertions, 16 deletions

diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index babecdc..dd310c1 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -103,28 +103,18 @@ void WriteValue(Message* m, const Value* value, int recursion) {
 
       WriteParam(m, static_cast<int>(dict->size()));
 
-      for (DictionaryValue::key_iterator it = dict->begin_keys();
-           it != dict->end_keys(); ++it) {
-        const Value* subval;
-        if (dict->GetWithoutPathExpansion(*it, &subval)) {
-          WriteParam(m, *it);
-          WriteValue(m, subval, recursion + 1);
-        } else {
-          NOTREACHED() << "DictionaryValue iterators are filthy liars.";
-        }
+      for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
+        WriteParam(m, it.key());
+        WriteValue(m, &it.value(), recursion + 1);
       }
       break;
     }
     case Value::TYPE_LIST: {
       const ListValue* list = static_cast<const ListValue*>(value);
       WriteParam(m, static_cast<int>(list->GetSize()));
-      for (size_t i = 0; i < list->GetSize(); ++i) {
-        const Value* subval;
-        if (list->Get(i, &subval)) {
-          WriteValue(m, subval, recursion + 1);
-        } else {
-          NOTREACHED() << "ListValue::GetSize is a filthy liar.";
-        }
+      for (ListValue::const_iterator it = list->begin(); it != list->end();
+           ++it) {
+        WriteValue(m, *it, recursion + 1);
       }
       break;
     }