| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <limits> | 5 #include <limits> |
| 6 | 6 |
| 7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "base/string_util.h" | |
| 9 #include "base/string16.h" | 8 #include "base/string16.h" |
| 10 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 11 #include "base/values.h" | 10 #include "base/values.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 12 |
| 14 class ValuesTest: public testing::Test { | 13 class ValuesTest: public testing::Test { |
| 15 protected: | 14 protected: |
| 16 void CompareDictionariesAndCheckResult( | 15 void CompareDictionariesAndCheckResult( |
| 17 const DictionaryValue* dict1, | 16 const DictionaryValue* dict1, |
| 18 const DictionaryValue* dict2, | 17 const DictionaryValue* dict2, |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 "s1", | 724 "s1", |
| 726 "s1.s2" | 725 "s1.s2" |
| 727 }; | 726 }; |
| 728 dict1.reset(new DictionaryValue()); | 727 dict1.reset(new DictionaryValue()); |
| 729 dict1->Set("s1.s2", new DictionaryValue()); | 728 dict1->Set("s1.s2", new DictionaryValue()); |
| 730 dict2.reset(new DictionaryValue()); | 729 dict2.reset(new DictionaryValue()); |
| 731 dict2->SetInteger("s1", 1); | 730 dict2->SetInteger("s1", 1); |
| 732 CompareDictionariesAndCheckResult(dict1.get(), dict2.get(), expected_paths8, | 731 CompareDictionariesAndCheckResult(dict1.get(), dict2.get(), expected_paths8, |
| 733 arraysize(expected_paths8)); | 732 arraysize(expected_paths8)); |
| 734 } | 733 } |
| OLD | NEW |