Many changes to DictionaryValues:...

chrome/test/ui/javascript_test_util.cc

 // Copyright (c) 2009 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/ui/javascript_test_util.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 11 matching lines @@
   EXPECT_TRUE(root.get());
   if (!root.get())
     return false;
 
   EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
   if (!root->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(root.get());
 
-  DictionaryValue::key_iterator it = dict->begin_keys();
-  for (; it != dict->end_keys(); ++it) {
+  for (DictionaryValue::key_iterator it = dict->begin_keys();
+       it != dict->end_keys(); ++it) {
     Value* value = NULL;
-    bool succeeded = dict->Get(*it, &value);
+    bool succeeded = dict->GetWithoutPathExpansion(*it, &value);
 
     EXPECT_TRUE(succeeded);
     if (!succeeded)
       continue;
 
     EXPECT_TRUE(value->IsType(Value::TYPE_STRING));
     if (value->IsType(Value::TYPE_STRING)) {
       std::string key = WideToUTF8(*it);
 
       std::string result;
       succeeded = value->GetAsString(&result);
       EXPECT_TRUE(succeeded);
 
       if (succeeded)
         results->insert(std::make_pair(key, result));
     }
   }
 
   return true;
 }