Removing base::DictionaryValue::key_iterator.

chrome/test/webdriver/webdriver_util.cc

 // Copyright (c) 2012 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/test/webdriver/webdriver_util.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 391 matching lines @@
 void TruncateString(std::string* data) {
   const size_t kMaxLength = 100;
   if (data->length() > kMaxLength) {
     data->resize(kMaxLength);
     data->replace(kMaxLength - 3, 3, "...");
   }
 }
 
 // Truncates all strings contained in the given value.
 void TruncateContainedStrings(Value* value) {
-  ListValue* list;
-  if (value->IsType(Value::TYPE_DICTIONARY)) {
-    DictionaryValue* dict = static_cast<DictionaryValue*>(value);
-    DictionaryValue::key_iterator key = dict->begin_keys();
-    for (; key != dict->end_keys(); ++key) {
-      Value* child;
-      if (!dict->GetWithoutPathExpansion(*key, &child))
-        continue;
+  ListValue* list = NULL;
+  DictionaryValue* dict = NULL;
+  if (value->GetAsDictionary(&dict)) {
+    for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
       std::string data;
-      if (child->GetAsString(&data)) {
+      if (it.value().GetAsString(&data)) {
         TruncateString(&data);
-        dict->SetWithoutPathExpansion(*key, new base::StringValue(data));
+        dict->SetWithoutPathExpansion(it.key(), new base::StringValue(data));
       } else {
+        Value* child = NULL;
+        dict->GetWithoutPathExpansion(it.key(), &child);
         TruncateContainedStrings(child);
       }
     }
   } else if (value->GetAsList(&list)) {
     for (size_t i = 0; i < list->GetSize(); ++i) {
       Value* child;
       if (!list->Get(i, &child))
         continue;
       std::string data;
       if (child->GetAsString(&data)) {
@@ skipping 115 matching lines @@
 
 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue(
     const Value* value, const webdriver::SkipParsing* t) {
   return true;
 }
 
 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert(
     const Value* value) {
   return true;
 }