| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string16.h" | 8 #include "base/string16.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 FundamentalValue* original_double = Value::CreateDoubleValue(3.14); | 334 FundamentalValue* original_double = Value::CreateDoubleValue(3.14); |
| 335 original_dict.Set("double", original_double); | 335 original_dict.Set("double", original_double); |
| 336 StringValue* original_string = Value::CreateStringValue("hello"); | 336 StringValue* original_string = Value::CreateStringValue("hello"); |
| 337 original_dict.Set("string", original_string); | 337 original_dict.Set("string", original_string); |
| 338 StringValue* original_string16 = | 338 StringValue* original_string16 = |
| 339 Value::CreateStringValue(ASCIIToUTF16("hello16")); | 339 Value::CreateStringValue(ASCIIToUTF16("hello16")); |
| 340 original_dict.Set("string16", original_string16); | 340 original_dict.Set("string16", original_string16); |
| 341 | 341 |
| 342 char* original_buffer = new char[42]; | 342 char* original_buffer = new char[42]; |
| 343 memset(original_buffer, '!', 42); | 343 memset(original_buffer, '!', 42); |
| 344 BinaryValue* original_binary = Value::CreateBinaryValue(original_buffer, 42); | 344 BinaryValue* original_binary = BinaryValue::Create(original_buffer, 42); |
| 345 original_dict.Set("binary", original_binary); | 345 original_dict.Set("binary", original_binary); |
| 346 | 346 |
| 347 ListValue* original_list = new ListValue(); | 347 ListValue* original_list = new ListValue(); |
| 348 FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0); | 348 FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0); |
| 349 original_list->Append(original_list_element_0); | 349 original_list->Append(original_list_element_0); |
| 350 FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1); | 350 FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1); |
| 351 original_list->Append(original_list_element_1); | 351 original_list->Append(original_list_element_1); |
| 352 original_dict.Set("list", original_list); | 352 original_dict.Set("list", original_list); |
| 353 | 353 |
| 354 scoped_ptr<DictionaryValue> copy_dict(original_dict.DeepCopy()); | 354 scoped_ptr<DictionaryValue> copy_dict(original_dict.DeepCopy()); |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 FundamentalValue* original_double = Value::CreateDoubleValue(3.14); | 526 FundamentalValue* original_double = Value::CreateDoubleValue(3.14); |
| 527 original_dict.Set("double", original_double); | 527 original_dict.Set("double", original_double); |
| 528 StringValue* original_string = Value::CreateStringValue("hello"); | 528 StringValue* original_string = Value::CreateStringValue("hello"); |
| 529 original_dict.Set("string", original_string); | 529 original_dict.Set("string", original_string); |
| 530 StringValue* original_string16 = | 530 StringValue* original_string16 = |
| 531 Value::CreateStringValue(ASCIIToUTF16("hello16")); | 531 Value::CreateStringValue(ASCIIToUTF16("hello16")); |
| 532 original_dict.Set("string16", original_string16); | 532 original_dict.Set("string16", original_string16); |
| 533 | 533 |
| 534 char* original_buffer = new char[42]; | 534 char* original_buffer = new char[42]; |
| 535 memset(original_buffer, '!', 42); | 535 memset(original_buffer, '!', 42); |
| 536 BinaryValue* original_binary = Value::CreateBinaryValue(original_buffer, 42); | 536 BinaryValue* original_binary = BinaryValue::Create(original_buffer, 42); |
| 537 original_dict.Set("binary", original_binary); | 537 original_dict.Set("binary", original_binary); |
| 538 | 538 |
| 539 ListValue* original_list = new ListValue(); | 539 ListValue* original_list = new ListValue(); |
| 540 FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0); | 540 FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0); |
| 541 original_list->Append(original_list_element_0); | 541 original_list->Append(original_list_element_0); |
| 542 FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1); | 542 FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1); |
| 543 original_list->Append(original_list_element_1); | 543 original_list->Append(original_list_element_1); |
| 544 original_dict.Set("list", original_list); | 544 original_dict.Set("list", original_list); |
| 545 | 545 |
| 546 Value* original_dict_value = &original_dict; | 546 Value* original_dict_value = &original_dict; |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 std::string sub_collide_key_value; | 685 std::string sub_collide_key_value; |
| 686 EXPECT_TRUE(res_sub_dict->GetString("sub_collide_key", | 686 EXPECT_TRUE(res_sub_dict->GetString("sub_collide_key", |
| 687 &sub_collide_key_value)); | 687 &sub_collide_key_value)); |
| 688 EXPECT_EQ("sub_collide_key_value_merge", sub_collide_key_value); // Replaced. | 688 EXPECT_EQ("sub_collide_key_value_merge", sub_collide_key_value); // Replaced. |
| 689 std::string sub_merge_key_value; | 689 std::string sub_merge_key_value; |
| 690 EXPECT_TRUE(res_sub_dict->GetString("sub_merge_key", &sub_merge_key_value)); | 690 EXPECT_TRUE(res_sub_dict->GetString("sub_merge_key", &sub_merge_key_value)); |
| 691 EXPECT_EQ("sub_merge_key_value_merge", sub_merge_key_value); // Merged in. | 691 EXPECT_EQ("sub_merge_key_value_merge", sub_merge_key_value); // Merged in. |
| 692 } | 692 } |
| 693 | 693 |
| 694 } // namespace base | 694 } // namespace base |
| OLD | NEW |