Skip to content

GitLab

T
tangled
Commit 69505dec authored by estade's avatar estade Committed by Commit bot
Browse files
Options

Change JSONReader::ReadToValue to return a scoped_ptr 

BUG=none

Review URL: https://codereview.chromium.org/1124223012

Cr-Commit-Position: refs/heads/master@{#330823}
parent 678b1e5a
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 80 deletions
base/json/json_reader.cc
View file @ 69505dec
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/json/json_parser.h" #include "base/json/json_parser.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/values.h"
namespace base { namespace base {
...@@ -99,8 +100,8 @@ std::string JSONReader::ErrorCodeToString(JsonParseError error_code) { ...@@ -99,8 +100,8 @@ std::string JSONReader::ErrorCodeToString(JsonParseError error_code) {
} }
} }
Value* JSONReader::ReadToValue(const std::string& json) { scoped_ptr<Value> JSONReader::ReadToValue(const std::string& json) {
return parser_->Parse(json); return make_scoped_ptr(parser_->Parse(json));
} }
JSONReader::JsonParseError JSONReader::error_code() const { JSONReader::JsonParseError JSONReader::error_code() const {
......
base/json/json_reader.h
View file @ 69505dec
...@@ -115,7 +115,7 @@ class BASE_EXPORT JSONReader { ...@@ -115,7 +115,7 @@ class BASE_EXPORT JSONReader {
static std::string ErrorCodeToString(JsonParseError error_code); static std::string ErrorCodeToString(JsonParseError error_code);
// Parses an input string into a Value that is owned by the caller. // Parses an input string into a Value that is owned by the caller.
Value* ReadToValue(const std::string& json); scoped_ptr<Value> ReadToValue(const std::string& json);
// Returns the error code if the last call to ReadToValue() failed. // Returns the error code if the last call to ReadToValue() failed.
// Returns JSON_NO_ERROR otherwise. // Returns JSON_NO_ERROR otherwise.
......
base/json/json_reader_unittest.cc
View file @ 69505dec
...@@ -20,36 +20,36 @@ namespace base { ...@@ -20,36 +20,36 @@ namespace base {
TEST(JSONReaderTest, Reading) { TEST(JSONReaderTest, Reading) {
// some whitespace checking // some whitespace checking
scoped_ptr<Value> root; scoped_ptr<Value> root;
root.reset(JSONReader().ReadToValue(" null ")); root = JSONReader().ReadToValue(" null ");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_NULL)); EXPECT_TRUE(root->IsType(Value::TYPE_NULL));
// Invalid JSON string // Invalid JSON string
root.reset(JSONReader().ReadToValue("nu")); root = JSONReader().ReadToValue("nu");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Simple bool // Simple bool
root.reset(JSONReader().ReadToValue("true ")); root = JSONReader().ReadToValue("true ");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_BOOLEAN)); EXPECT_TRUE(root->IsType(Value::TYPE_BOOLEAN));
// Embedded comment // Embedded comment
root.reset(JSONReader().ReadToValue("/* comment */null")); root = JSONReader().ReadToValue("/* comment */null");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_NULL)); EXPECT_TRUE(root->IsType(Value::TYPE_NULL));
root.reset(JSONReader().ReadToValue("40 /* comment */")); root = JSONReader().ReadToValue("40 /* comment */");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER)); EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER));
root.reset(JSONReader().ReadToValue("true // comment")); root = JSONReader().ReadToValue("true // comment");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_BOOLEAN)); EXPECT_TRUE(root->IsType(Value::TYPE_BOOLEAN));
root.reset(JSONReader().ReadToValue("/* comment */\"sample string\"")); root = JSONReader().ReadToValue("/* comment */\"sample string\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
std::string value; std::string value;
EXPECT_TRUE(root->GetAsString(&value)); EXPECT_TRUE(root->GetAsString(&value));
EXPECT_EQ("sample string", value); EXPECT_EQ("sample string", value);
root.reset(JSONReader().ReadToValue("[1, /* comment, 2 ] */ \n 3]")); root = JSONReader().ReadToValue("[1, /* comment, 2 ] */ \n 3]");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
ListValue* list = static_cast<ListValue*>(root.get()); ListValue* list = static_cast<ListValue*>(root.get());
EXPECT_EQ(2u, list->GetSize()); EXPECT_EQ(2u, list->GetSize());
...@@ -58,42 +58,42 @@ TEST(JSONReaderTest, Reading) { ...@@ -58,42 +58,42 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ(1, int_val); EXPECT_EQ(1, int_val);
EXPECT_TRUE(list->GetInteger(1, &int_val)); EXPECT_TRUE(list->GetInteger(1, &int_val));
EXPECT_EQ(3, int_val); EXPECT_EQ(3, int_val);
root.reset(JSONReader().ReadToValue("[1, /*a*/2, 3]")); root = JSONReader().ReadToValue("[1, /*a*/2, 3]");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
list = static_cast<ListValue*>(root.get()); list = static_cast<ListValue*>(root.get());
EXPECT_EQ(3u, list->GetSize()); EXPECT_EQ(3u, list->GetSize());
root.reset(JSONReader().ReadToValue("/* comment **/42")); root = JSONReader().ReadToValue("/* comment **/42");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER)); EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER));
EXPECT_TRUE(root->GetAsInteger(&int_val)); EXPECT_TRUE(root->GetAsInteger(&int_val));
EXPECT_EQ(42, int_val); EXPECT_EQ(42, int_val);
root.reset(JSONReader().ReadToValue( root = JSONReader().ReadToValue(
"/* comment **/\n" "/* comment **/\n"
"// */ 43\n" "// */ 43\n"
"44")); "44");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER)); EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER));
EXPECT_TRUE(root->GetAsInteger(&int_val)); EXPECT_TRUE(root->GetAsInteger(&int_val));
EXPECT_EQ(44, int_val); EXPECT_EQ(44, int_val);
// Test number formats // Test number formats
root.reset(JSONReader().ReadToValue("43")); root = JSONReader().ReadToValue("43");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER)); EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER));
EXPECT_TRUE(root->GetAsInteger(&int_val)); EXPECT_TRUE(root->GetAsInteger(&int_val));
EXPECT_EQ(43, int_val); EXPECT_EQ(43, int_val);
// According to RFC4627, oct, hex, and leading zeros are invalid JSON. // According to RFC4627, oct, hex, and leading zeros are invalid JSON.
root.reset(JSONReader().ReadToValue("043")); root = JSONReader().ReadToValue("043");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("0x43")); root = JSONReader().ReadToValue("0x43");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("00")); root = JSONReader().ReadToValue("00");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Test 0 (which needs to be special cased because of the leading zero // Test 0 (which needs to be special cased because of the leading zero
// clause). // clause).
root.reset(JSONReader().ReadToValue("0")); root = JSONReader().ReadToValue("0");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER)); EXPECT_TRUE(root->IsType(Value::TYPE_INTEGER));
int_val = 1; int_val = 1;
...@@ -102,14 +102,14 @@ TEST(JSONReaderTest, Reading) { ...@@ -102,14 +102,14 @@ TEST(JSONReaderTest, Reading) {
// Numbers that overflow ints should succeed, being internally promoted to // Numbers that overflow ints should succeed, being internally promoted to
// storage as doubles // storage as doubles
root.reset(JSONReader().ReadToValue("2147483648")); root = JSONReader().ReadToValue("2147483648");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
double double_val; double double_val;
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(2147483648.0, double_val); EXPECT_DOUBLE_EQ(2147483648.0, double_val);
root.reset(JSONReader().ReadToValue("-2147483649")); root = JSONReader().ReadToValue("-2147483649");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
...@@ -117,42 +117,42 @@ TEST(JSONReaderTest, Reading) { ...@@ -117,42 +117,42 @@ TEST(JSONReaderTest, Reading) {
EXPECT_DOUBLE_EQ(-2147483649.0, double_val); EXPECT_DOUBLE_EQ(-2147483649.0, double_val);
// Parse a double // Parse a double
root.reset(JSONReader().ReadToValue("43.1")); root = JSONReader().ReadToValue("43.1");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(43.1, double_val); EXPECT_DOUBLE_EQ(43.1, double_val);
root.reset(JSONReader().ReadToValue("4.3e-1")); root = JSONReader().ReadToValue("4.3e-1");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(.43, double_val); EXPECT_DOUBLE_EQ(.43, double_val);
root.reset(JSONReader().ReadToValue("2.1e0")); root = JSONReader().ReadToValue("2.1e0");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(2.1, double_val); EXPECT_DOUBLE_EQ(2.1, double_val);
root.reset(JSONReader().ReadToValue("2.1e+0001")); root = JSONReader().ReadToValue("2.1e+0001");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(21.0, double_val); EXPECT_DOUBLE_EQ(21.0, double_val);
root.reset(JSONReader().ReadToValue("0.01")); root = JSONReader().ReadToValue("0.01");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
EXPECT_TRUE(root->GetAsDouble(&double_val)); EXPECT_TRUE(root->GetAsDouble(&double_val));
EXPECT_DOUBLE_EQ(0.01, double_val); EXPECT_DOUBLE_EQ(0.01, double_val);
root.reset(JSONReader().ReadToValue("1.00")); root = JSONReader().ReadToValue("1.00");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE)); EXPECT_TRUE(root->IsType(Value::TYPE_DOUBLE));
double_val = 0.0; double_val = 0.0;
...@@ -160,43 +160,43 @@ TEST(JSONReaderTest, Reading) { ...@@ -160,43 +160,43 @@ TEST(JSONReaderTest, Reading) {
EXPECT_DOUBLE_EQ(1.0, double_val); EXPECT_DOUBLE_EQ(1.0, double_val);
// Fractional parts must have a digit before and after the decimal point. // Fractional parts must have a digit before and after the decimal point.
root.reset(JSONReader().ReadToValue("1.")); root = JSONReader().ReadToValue("1.");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue(".1")); root = JSONReader().ReadToValue(".1");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("1.e10")); root = JSONReader().ReadToValue("1.e10");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Exponent must have a digit following the 'e'. // Exponent must have a digit following the 'e'.
root.reset(JSONReader().ReadToValue("1e")); root = JSONReader().ReadToValue("1e");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("1E")); root = JSONReader().ReadToValue("1E");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("1e1.")); root = JSONReader().ReadToValue("1e1.");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("1e1.0")); root = JSONReader().ReadToValue("1e1.0");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// INF/-INF/NaN are not valid // INF/-INF/NaN are not valid
root.reset(JSONReader().ReadToValue("1e1000")); root = JSONReader().ReadToValue("1e1000");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("-1e1000")); root = JSONReader().ReadToValue("-1e1000");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("NaN")); root = JSONReader().ReadToValue("NaN");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("nan")); root = JSONReader().ReadToValue("nan");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("inf")); root = JSONReader().ReadToValue("inf");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Invalid number formats // Invalid number formats
root.reset(JSONReader().ReadToValue("4.3.1")); root = JSONReader().ReadToValue("4.3.1");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("4e3.1")); root = JSONReader().ReadToValue("4e3.1");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Test string parser // Test string parser
root.reset(JSONReader().ReadToValue("\"hello world\"")); root = JSONReader().ReadToValue("\"hello world\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
std::string str_val; std::string str_val;
...@@ -204,7 +204,7 @@ TEST(JSONReaderTest, Reading) { ...@@ -204,7 +204,7 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ("hello world", str_val); EXPECT_EQ("hello world", str_val);
// Empty string // Empty string
root.reset(JSONReader().ReadToValue("\"\"")); root = JSONReader().ReadToValue("\"\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
...@@ -212,7 +212,7 @@ TEST(JSONReaderTest, Reading) { ...@@ -212,7 +212,7 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ("", str_val); EXPECT_EQ("", str_val);
// Test basic string escapes // Test basic string escapes
root.reset(JSONReader().ReadToValue("\" \\\"\\\\\\/\\b\\f\\n\\r\\t\\v\"")); root = JSONReader().ReadToValue("\" \\\"\\\\\\/\\b\\f\\n\\r\\t\\v\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
...@@ -220,7 +220,7 @@ TEST(JSONReaderTest, Reading) { ...@@ -220,7 +220,7 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ(" \"\\/\b\f\n\r\t\v", str_val); EXPECT_EQ(" \"\\/\b\f\n\r\t\v", str_val);
// Test hex and unicode escapes including the null character. // Test hex and unicode escapes including the null character.
root.reset(JSONReader().ReadToValue("\"\\x41\\x00\\u1234\"")); root = JSONReader().ReadToValue("\"\\x41\\x00\\u1234\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
...@@ -228,17 +228,17 @@ TEST(JSONReaderTest, Reading) { ...@@ -228,17 +228,17 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ(std::wstring(L"A\0\x1234", 3), UTF8ToWide(str_val)); EXPECT_EQ(std::wstring(L"A\0\x1234", 3), UTF8ToWide(str_val));
// Test invalid strings // Test invalid strings
root.reset(JSONReader().ReadToValue("\"no closing quote")); root = JSONReader().ReadToValue("\"no closing quote");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"\\z invalid escape char\"")); root = JSONReader().ReadToValue("\"\\z invalid escape char\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"\\xAQ invalid hex code\"")); root = JSONReader().ReadToValue("\"\\xAQ invalid hex code\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("not enough hex chars\\x1\"")); root = JSONReader().ReadToValue("not enough hex chars\\x1\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"not enough escape chars\\u123\"")); root = JSONReader().ReadToValue("\"not enough escape chars\\u123\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"extra backslash at end of input\\\"")); root = JSONReader().ReadToValue("\"extra backslash at end of input\\\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Basic array // Basic array
...@@ -466,15 +466,15 @@ TEST(JSONReaderTest, Reading) { ...@@ -466,15 +466,15 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ(5001U, list->GetSize()); EXPECT_EQ(5001U, list->GetSize());
// Test utf8 encoded input // Test utf8 encoded input
root.reset(JSONReader().ReadToValue("\"\xe7\xbd\x91\xe9\xa1\xb5\"")); root = JSONReader().ReadToValue("\"\xe7\xbd\x91\xe9\xa1\xb5\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
EXPECT_TRUE(root->GetAsString(&str_val)); EXPECT_TRUE(root->GetAsString(&str_val));
EXPECT_EQ(L"\x7f51\x9875", UTF8ToWide(str_val)); EXPECT_EQ(L"\x7f51\x9875", UTF8ToWide(str_val));
root.reset(JSONReader().ReadToValue( root = JSONReader().ReadToValue(
"{\"path\": \"/tmp/\xc3\xa0\xc3\xa8\xc3\xb2.png\"}")); "{\"path\": \"/tmp/\xc3\xa0\xc3\xa8\xc3\xb2.png\"}");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
EXPECT_TRUE(root->GetAsDictionary(&dict_val)); EXPECT_TRUE(root->GetAsDictionary(&dict_val));
...@@ -482,22 +482,22 @@ TEST(JSONReaderTest, Reading) { ...@@ -482,22 +482,22 @@ TEST(JSONReaderTest, Reading) {
EXPECT_EQ("/tmp/\xC3\xA0\xC3\xA8\xC3\xB2.png", str_val); EXPECT_EQ("/tmp/\xC3\xA0\xC3\xA8\xC3\xB2.png", str_val);
// Test invalid utf8 encoded input // Test invalid utf8 encoded input
root.reset(JSONReader().ReadToValue("\"345\xb0\xa1\xb0\xa2\"")); root = JSONReader().ReadToValue("\"345\xb0\xa1\xb0\xa2\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"123\xc0\x81\"")); root = JSONReader().ReadToValue("\"123\xc0\x81\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
root.reset(JSONReader().ReadToValue("\"abc\xc0\xae\"")); root = JSONReader().ReadToValue("\"abc\xc0\xae\"");
EXPECT_FALSE(root.get()); EXPECT_FALSE(root.get());
// Test utf16 encoded strings. // Test utf16 encoded strings.
root.reset(JSONReader().ReadToValue("\"\\u20ac3,14\"")); root = JSONReader().ReadToValue("\"\\u20ac3,14\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
EXPECT_TRUE(root->GetAsString(&str_val)); EXPECT_TRUE(root->GetAsString(&str_val));
EXPECT_EQ("\xe2\x82\xac""3,14", str_val); EXPECT_EQ("\xe2\x82\xac""3,14", str_val);
root.reset(JSONReader().ReadToValue("\"\\ud83d\\udca9\\ud83d\\udc6c\"")); root = JSONReader().ReadToValue("\"\\ud83d\\udca9\\ud83d\\udc6c\"");
ASSERT_TRUE(root.get()); ASSERT_TRUE(root.get());
EXPECT_TRUE(root->IsType(Value::TYPE_STRING)); EXPECT_TRUE(root->IsType(Value::TYPE_STRING));
str_val.clear(); str_val.clear();
...@@ -516,7 +516,7 @@ TEST(JSONReaderTest, Reading) { ...@@ -516,7 +516,7 @@ TEST(JSONReaderTest, Reading) {
"\"\\ud83\\foo\"" // No lower surrogate. "\"\\ud83\\foo\"" // No lower surrogate.
}; };
for (size_t i = 0; i < arraysize(cases); ++i) { for (size_t i = 0; i < arraysize(cases); ++i) {
root.reset(JSONReader().ReadToValue(cases[i])); root = JSONReader().ReadToValue(cases[i]);
EXPECT_FALSE(root.get()) << cases[i]; EXPECT_FALSE(root.get()) << cases[i];
} }
......
chrome/browser/local_discovery/privet_url_fetcher.cc
View file @ 69505dec
...@@ -303,10 +303,7 @@ void PrivetURLFetcher::OnURLFetchCompleteParseData( ...@@ -303,10 +303,7 @@ void PrivetURLFetcher::OnURLFetchCompleteParseData(
} }
base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS);
scoped_ptr<base::Value> value; scoped_ptr<base::Value> value = json_reader.ReadToValue(response_str);
value.reset(json_reader.ReadToValue(response_str));
if (!value) { if (!value) {
delegate_->OnError(this, JSON_PARSE_ERROR); delegate_->OnError(this, JSON_PARSE_ERROR);
return; return;
......
chrome/test/chromedriver/chrome/mobile_device.cc
View file @ 69505dec
...@@ -16,8 +16,8 @@ MobileDevice::~MobileDevice() {} ...@@ -16,8 +16,8 @@ MobileDevice::~MobileDevice() {}
Status FindMobileDevice(std::string device_name, Status FindMobileDevice(std::string device_name,
scoped_ptr<MobileDevice>* mobile_device) { scoped_ptr<MobileDevice>* mobile_device) {
base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS);
scoped_ptr<base::Value> devices_value; scoped_ptr<base::Value> devices_value =
devices_value.reset(json_reader.ReadToValue(kMobileDevices)); json_reader.ReadToValue(kMobileDevices);
if (!devices_value.get()) if (!devices_value.get())
return Status(kUnknownError, return Status(kUnknownError,
"could not parse mobile device list because " + "could not parse mobile device list because " +
......
chrome/test/chromedriver/chrome/network_conditions.cc
View file @ 69505dec
...@@ -24,9 +24,8 @@ NetworkConditions::~NetworkConditions() {} ...@@ -24,9 +24,8 @@ NetworkConditions::~NetworkConditions() {}
Status FindPresetNetwork(std::string network_name, Status FindPresetNetwork(std::string network_name,
NetworkConditions* network_conditions) { NetworkConditions* network_conditions) {
base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader json_reader(base::JSON_ALLOW_TRAILING_COMMAS);
scoped_ptr<base::Value> networks_value; scoped_ptr<base::Value> networks_value = json_reader.ReadToValue(kNetworks);
networks_value.reset(json_reader.ReadToValue(kNetworks)); if (!networks_value)
if (!networks_value.get())
return Status(kUnknownError, return Status(kUnknownError,
"could not parse network list because " + "could not parse network list because " +
json_reader.GetErrorMessage()); json_reader.GetErrorMessage());
...@@ -38,7 +37,6 @@ Status FindPresetNetwork(std::string network_name, ...@@ -38,7 +37,6 @@ Status FindPresetNetwork(std::string network_name,
for (base::ListValue::iterator it = networks->begin(); for (base::ListValue::iterator it = networks->begin();
it != networks->end(); it != networks->end();
++it) { ++it) {
base::DictionaryValue* network = NULL; base::DictionaryValue* network = NULL;
if (!(*it)->GetAsDictionary(&network)) { if (!(*it)->GetAsDictionary(&network)) {
return Status(kUnknownError, return Status(kUnknownError,
......
chrome/test/nacl/nacl_browsertest_util.cc
View file @ 69505dec
...@@ -24,12 +24,11 @@ typedef content::TestMessageHandler::MessageResponse MessageResponse; ...@@ -24,12 +24,11 @@ typedef content::TestMessageHandler::MessageResponse MessageResponse;
MessageResponse StructuredMessageHandler::HandleMessage( MessageResponse StructuredMessageHandler::HandleMessage(
const std::string& json) { const std::string& json) {
scoped_ptr<base::Value> value;
base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS);
// Automation messages are stringified before they are sent because the // Automation messages are stringified before they are sent because the
// automation channel cannot handle arbitrary objects. This means we // automation channel cannot handle arbitrary objects. This means we
// need to decode the json twice to get the original message. // need to decode the json twice to get the original message.
value.reset(reader.ReadToValue(json)); scoped_ptr<base::Value> value = reader.ReadToValue(json);
if (!value.get()) if (!value.get())
return InternalError("Could parse automation JSON: " + json + return InternalError("Could parse automation JSON: " + json +
" because " + reader.GetErrorMessage()); " because " + reader.GetErrorMessage());
...@@ -38,7 +37,7 @@ MessageResponse StructuredMessageHandler::HandleMessage( ...@@ -38,7 +37,7 @@ MessageResponse StructuredMessageHandler::HandleMessage(
if (!value->GetAsString(&temp)) if (!value->GetAsString(&temp))
return InternalError("Message was not a string: " + json); return InternalError("Message was not a string: " + json);
value.reset(reader.ReadToValue(temp)); value = reader.ReadToValue(temp);
if (!value.get()) if (!value.get())
return InternalError("Could not parse message JSON: " + temp + return InternalError("Could not parse message JSON: " + temp +
" because " + reader.GetErrorMessage()); " because " + reader.GetErrorMessage());
......
content/public/test/browser_test_utils.cc
View file @ 69505dec
...@@ -150,8 +150,8 @@ bool ExecuteScriptHelper(RenderFrameHost* render_frame_host, ...@@ -150,8 +150,8 @@ bool ExecuteScriptHelper(RenderFrameHost* render_frame_host,
return true; return true;
base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS);
result->reset(reader.ReadToValue(json)); *result = reader.ReadToValue(json);
if (!result->get()) { if (!*result) {
DLOG(ERROR) << reader.GetErrorMessage(); DLOG(ERROR) << reader.GetErrorMessage();
return false; return false;
} }
......
extensions/browser/value_store/leveldb_value_store.cc
View file @ 69505dec
...@@ -146,12 +146,13 @@ ValueStore::ReadResult LeveldbValueStore::Get() { ...@@ -146,12 +146,13 @@ ValueStore::ReadResult LeveldbValueStore::Get() {
scoped_ptr<leveldb::Iterator> it(db_->NewIterator(options)); scoped_ptr<leveldb::Iterator> it(db_->NewIterator(options));
for (it->SeekToFirst(); it->Valid(); it->Next()) { for (it->SeekToFirst(); it->Valid(); it->Next()) {
std::string key = it->key().ToString(); std::string key = it->key().ToString();
base::Value* value = json_reader.ReadToValue(it->value().ToString()); scoped_ptr<base::Value> value =
json_reader.ReadToValue(it->value().ToString());
if (!value) { if (!value) {
return MakeReadResult( return MakeReadResult(
Error::Create(CORRUPTION, kInvalidJson, util::NewKey(key))); Error::Create(CORRUPTION, kInvalidJson, util::NewKey(key)));
} }
settings->SetWithoutPathExpansion(key, value); settings->SetWithoutPathExpansion(key, value.Pass());
} }
if (it->status().IsNotFound()) { if (it->status().IsNotFound()) {
...@@ -357,11 +358,11 @@ scoped_ptr<ValueStore::Error> LeveldbValueStore::ReadFromDb( ...@@ -357,11 +358,11 @@ scoped_ptr<ValueStore::Error> LeveldbValueStore::ReadFromDb(
if (!s.ok()) if (!s.ok())
return ToValueStoreError(s, util::NewKey(key)); return ToValueStoreError(s, util::NewKey(key));
base::Value* value = base::JSONReader().ReadToValue(value_as_json); scoped_ptr<base::Value> value = base::JSONReader().ReadToValue(value_as_json);
if (!value) if (!value)
return Error::Create(CORRUPTION, kInvalidJson, util::NewKey(key)); return Error::Create(CORRUPTION, kInvalidJson, util::NewKey(key));
setting->reset(value); *setting = value.Pass();
return util::NoError(); return util::NoError();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment