Fix DictionaryValue::Equals() to also detect differences in key names.

base/values_unittest.cc

 // Copyright (c) 2010 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 <limits>
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 467 matching lines @@
   delete boolean;
 
   DictionaryValue dv;
   dv.SetBoolean("a", false);
   dv.SetInteger("b", 2);
   dv.SetReal("c", 2.5);
   dv.SetString("d1", "string");
   dv.SetString("d2", ASCIIToUTF16("http://google.com"));
   dv.Set("e", Value::CreateNullValue());
 
-  DictionaryValue* copy = static_cast<DictionaryValue*>(dv.DeepCopy());
-  EXPECT_TRUE(dv.Equals(copy));
+  scoped_ptr<DictionaryValue> copy;
+  copy.reset(static_cast<DictionaryValue*>(dv.DeepCopy()));
+  EXPECT_TRUE(dv.Equals(copy.get()));
 
   ListValue* list = new ListValue;
   list->Append(Value::CreateNullValue());
   list->Append(new DictionaryValue);
   dv.Set("f", list);
 
-  EXPECT_FALSE(dv.Equals(copy));
+  EXPECT_FALSE(dv.Equals(copy.get()));
   copy->Set("f", list->DeepCopy());
-  EXPECT_TRUE(dv.Equals(copy));
+  EXPECT_TRUE(dv.Equals(copy.get()));
 
   list->Append(Value::CreateBooleanValue(true));
-  EXPECT_FALSE(dv.Equals(copy));
-  delete copy;
+  EXPECT_FALSE(dv.Equals(copy.get()));
+
+  // Check if Equals detects differences in only the keys.
+  copy.reset(static_cast<DictionaryValue*>(dv.DeepCopy()));
+  EXPECT_TRUE(dv.Equals(copy.get()));
+  copy->Remove("a", NULL);
+  copy->SetBoolean("aa", false);
+  EXPECT_FALSE(dv.Equals(copy.get()));
 }
 
 TEST_F(ValuesTest, RemoveEmptyChildren) {
   scoped_ptr<DictionaryValue> root(new DictionaryValue);
   // Remove empty lists and dictionaries.
   root->Set("empty_dict", new DictionaryValue);
   root->Set("empty_list", new ListValue);
   root->SetWithoutPathExpansion("a.b.c.d.e", new DictionaryValue);
   root.reset(root->DeepCopyWithoutEmptyChildren());
   EXPECT_TRUE(root->empty());
@@ skipping 212 matching lines @@
     "s1",
     "s1.s2"
   };
   dict1.reset(new DictionaryValue());
   dict1->Set("s1.s2", new DictionaryValue());
   dict2.reset(new DictionaryValue());
   dict2->SetInteger("s1", 1);
   CompareDictionariesAndCheckResult(dict1.get(), dict2.get(), expected_paths8,
                                     arraysize(expected_paths8));
 }