OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/test/values_test_util.h" | 5 #include "base/test/values_test_util.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
13 | 14 |
14 namespace base { | 15 namespace base { |
15 | 16 |
16 void ExpectDictBooleanValue(bool expected_value, | 17 void ExpectDictBooleanValue(bool expected_value, |
17 const DictionaryValue& value, | 18 const DictionaryValue& value, |
18 const std::string& key) { | 19 const std::string& key) { |
19 bool boolean_value = false; | 20 bool boolean_value = false; |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 } | 62 } |
62 | 63 |
63 namespace test { | 64 namespace test { |
64 | 65 |
65 std::unique_ptr<Value> ParseJson(base::StringPiece json) { | 66 std::unique_ptr<Value> ParseJson(base::StringPiece json) { |
66 std::string error_msg; | 67 std::string error_msg; |
67 std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError( | 68 std::unique_ptr<Value> result = base::JSONReader::ReadAndReturnError( |
68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); | 69 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); |
69 if (!result) { | 70 if (!result) { |
70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; | 71 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; |
71 result = Value::CreateNullValue(); | 72 result = MakeUnique<Value>(); |
72 } | 73 } |
73 return result; | 74 return result; |
74 } | 75 } |
75 | 76 |
76 } // namespace test | 77 } // namespace test |
77 } // namespace base | 78 } // namespace base |
OLD | NEW |