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 "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 namespace test { | 63 namespace test { |
64 | 64 |
65 scoped_ptr<Value> ParseJson(base::StringPiece json) { | 65 scoped_ptr<Value> ParseJson(base::StringPiece json) { |
66 std::string error_msg; | 66 std::string error_msg; |
67 scoped_ptr<Value> result = base::JSONReader::ReadAndReturnError( | 67 scoped_ptr<Value> result = base::JSONReader::ReadAndReturnError( |
68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); | 68 json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); |
69 if (!result) { | 69 if (!result) { |
70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; | 70 ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; |
71 result = Value::CreateNullValue(); | 71 result = Value::CreateNullValue(); |
72 } | 72 } |
73 return result.Pass(); | 73 return result; |
74 } | 74 } |
75 | 75 |
76 } // namespace test | 76 } // namespace test |
77 } // namespace base | 77 } // namespace base |
OLD | NEW |