Chromium Code Reviews| 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 #ifndef BASE_TEST_VALUES_TEST_UTIL_H_ | 5 #ifndef BASE_TEST_VALUES_TEST_UTIL_H_ |
| 6 #define BASE_TEST_VALUES_TEST_UTIL_H_ | 6 #define BASE_TEST_VALUES_TEST_UTIL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 void ExpectStringValue(const std::string& expected_str, | 43 void ExpectStringValue(const std::string& expected_str, |
| 44 StringValue* actual); | 44 StringValue* actual); |
| 45 | 45 |
| 46 namespace test { | 46 namespace test { |
| 47 | 47 |
| 48 // Parses |json| as JSON, allowing trailing commas, and returns the | 48 // Parses |json| as JSON, allowing trailing commas, and returns the |
| 49 // resulting value. If the json fails to parse, causes an EXPECT | 49 // resulting value. If the json fails to parse, causes an EXPECT |
| 50 // failure and returns the Null Value (but never a NULL pointer). | 50 // failure and returns the Null Value (but never a NULL pointer). |
| 51 scoped_ptr<Value> ParseJson(base::StringPiece json); | 51 scoped_ptr<Value> ParseJson(base::StringPiece json); |
| 52 | 52 |
| 53 // Parses |json| allowing trailing commas and replacing single quotes with | |
| 54 // double quotes for test readability. Returns an empty dictionary if the json | |
|
Jeffrey Yasskin
2014/03/04 01:41:48
Mention the EXPECT failure here.
scheib
2014/03/04 15:34:31
Done.
| |
| 55 // fails to parse. | |
| 56 scoped_ptr<DictionaryValue> ParseJsonDictionaryWithSingleQuotes( | |
| 57 base::StringPiece json); | |
| 58 | |
| 53 } // namespace test | 59 } // namespace test |
| 54 } // namespace base | 60 } // namespace base |
| 55 | 61 |
| 56 #endif // BASE_TEST_VALUES_TEST_UTIL_H_ | 62 #endif // BASE_TEST_VALUES_TEST_UTIL_H_ |
| OLD | NEW |