Removing base::DictionaryValue::key_iterator.

chrome/test/webdriver/webdriver_capabilities_parser.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_capabilities_parser.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 278 matching lines @@
   std::set<std::string> proxy_options;
   proxy_options.insert("autodetect");
   proxy_options.insert("ftpProxy");
   proxy_options.insert("httpProxy");
   proxy_options.insert("noProxy");
   proxy_options.insert("proxyType");
   proxy_options.insert("proxyAutoconfigUrl");
   proxy_options.insert("sslProxy");
   proxy_options.insert("class");  // Created by BeanToJSONConverter.
 
-  DictionaryValue::key_iterator key_iter = options->begin_keys();
-  for (; key_iter != options->end_keys(); ++key_iter) {
-    if (proxy_options.find(*key_iter) == proxy_options.end()) {
-      logger_.Log(kInfoLogLevel, "Unrecognized proxy capability: " + *key_iter);
+  for (DictionaryValue::Iterator iter(*options); !iter.IsAtEnd();
+       iter.Advance()) {
+    if (proxy_options.find(iter.key()) == proxy_options.end()) {
+      logger_.Log(kInfoLogLevel,
+                  "Unrecognized proxy capability: " + iter.key());
     }
   }
 
   typedef Error* (CapabilitiesParser::*Parser)(const DictionaryValue*);
   std::map<std::string, Parser> proxy_type_parser_map;
   proxy_type_parser_map["autodetect"] =
       &CapabilitiesParser::ParseProxyAutoDetect;
   proxy_type_parser_map["pac"] =
       &CapabilitiesParser::ParseProxyAutoconfigUrl;
   proxy_type_parser_map["manual"] = &CapabilitiesParser::ParseProxyServers;
@@ skipping 130 matching lines @@
     if (!switches->GetString(i, &switch_name)) {
       return new Error(kBadRequest,
                        "Each switch to be removed must be a string");
     }
     caps_->exclude_switches.insert(switch_name);
   }
   return NULL;
 }
 
 }  // namespace webdriver