diff options
196 files changed, 494 insertions, 471 deletions
diff --git a/base/json/json_parser_unittest.cc b/base/json/json_parser_unittest.cc index 74e2026..f776ddf 100644 --- a/base/json/json_parser_unittest.cc +++ b/base/json/json_parser_unittest.cc @@ -204,16 +204,16 @@ TEST_F(JSONParserTest, ErrorMessages) { std::string error_message; int error_code = 0; scoped_ptr<Value> root; - root.reset(JSONReader::ReadAndReturnError("[42]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[42]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_TRUE(error_message.empty()); EXPECT_EQ(0, error_code); // Test line and column counting const char big_json[] = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]"; // error here ----------------------------------^ - root.reset(JSONReader::ReadAndReturnError(big_json, JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + big_json, JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError), error_message); @@ -225,16 +225,16 @@ TEST_F(JSONParserTest, ErrorMessages) { const char big_json_crlf[] = "[\r\n0,\r\n1,\r\n2,\r\n3,4,5,6 7,\r\n8,\r\n9\r\n]"; // error here ----------------------^ - root.reset(JSONReader::ReadAndReturnError(big_json_crlf, JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + big_json_crlf, JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError), error_message); EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code); // Test each of the error conditions - root.reset(JSONReader::ReadAndReturnError("{},{}", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "{},{}", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 3, JSONReader::kUnexpectedDataAfterRoot), error_message); @@ -245,57 +245,56 @@ TEST_F(JSONParserTest, ErrorMessages) { nested_json.insert(nested_json.begin(), '['); nested_json.append(1, ']'); } - root.reset(JSONReader::ReadAndReturnError(nested_json, JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + nested_json, JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 100, JSONReader::kTooMuchNesting), error_message); EXPECT_EQ(JSONReader::JSON_TOO_MUCH_NESTING, error_code); - root.reset(JSONReader::ReadAndReturnError("[1,]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[1,]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 4, JSONReader::kTrailingComma), error_message); EXPECT_EQ(JSONReader::JSON_TRAILING_COMMA, error_code); - root.reset(JSONReader::ReadAndReturnError("{foo:\"bar\"}", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "{foo:\"bar\"}", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 2, JSONReader::kUnquotedDictionaryKey), error_message); EXPECT_EQ(JSONReader::JSON_UNQUOTED_DICTIONARY_KEY, error_code); - root.reset(JSONReader::ReadAndReturnError("{\"foo\":\"bar\",}", - JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "{\"foo\":\"bar\",}", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 14, JSONReader::kTrailingComma), error_message); - root.reset(JSONReader::ReadAndReturnError("[nu]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[nu]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 2, JSONReader::kSyntaxError), error_message); EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code); - root.reset(JSONReader::ReadAndReturnError("[\"xxx\\xq\"]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[\"xxx\\xq\"]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape), error_message); EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code); - root.reset(JSONReader::ReadAndReturnError("[\"xxx\\uq\"]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[\"xxx\\uq\"]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape), error_message); EXPECT_EQ(JSONReader::JSON_INVALID_ESCAPE, error_code); - root.reset(JSONReader::ReadAndReturnError("[\"xxx\\q\"]", JSON_PARSE_RFC, - &error_code, &error_message)); + root.reset(JSONReader::DeprecatedReadAndReturnError( + "[\"xxx\\q\"]", JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); EXPECT_EQ(JSONParser::FormatErrorMessage(1, 7, JSONReader::kInvalidEscape), error_message); @@ -309,9 +308,8 @@ TEST_F(JSONParserTest, Decode4ByteUtf8Char) { "[\"😇\",[],[],[],{\"google:suggesttype\":[]}]"; std::string error_message; int error_code = 0; - scoped_ptr<Value> root( - JSONReader::ReadAndReturnError(kUtf8Data, JSON_PARSE_RFC, &error_code, - &error_message)); + scoped_ptr<Value> root(JSONReader::DeprecatedReadAndReturnError( + kUtf8Data, JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_TRUE(root.get()) << error_message; } diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc index 343cbc7..ad3ea98 100644 --- a/base/json/json_reader.cc +++ b/base/json/json_reader.cc @@ -43,34 +43,51 @@ JSONReader::~JSONReader() { } // static -Value* JSONReader::Read(const StringPiece& json) { +Value* JSONReader::DeprecatedRead(const StringPiece& json) { + return Read(json).release(); +} + +// static +scoped_ptr<Value> JSONReader::Read(const StringPiece& json) { internal::JSONParser parser(JSON_PARSE_RFC); - return parser.Parse(json); + return make_scoped_ptr(parser.Parse(json)); } // static -Value* JSONReader::Read(const StringPiece& json, - int options) { - internal::JSONParser parser(options); - return parser.Parse(json); +Value* JSONReader::DeprecatedRead(const StringPiece& json, int options) { + return Read(json, options).release(); } // static -Value* JSONReader::ReadAndReturnError(const StringPiece& json, - int options, - int* error_code_out, - std::string* error_msg_out) { +scoped_ptr<Value> JSONReader::Read(const StringPiece& json, int options) { internal::JSONParser parser(options); - Value* root = parser.Parse(json); - if (root) - return root; + return make_scoped_ptr(parser.Parse(json)); +} - if (error_code_out) - *error_code_out = parser.error_code(); - if (error_msg_out) - *error_msg_out = parser.GetErrorMessage(); +// static +Value* JSONReader::DeprecatedReadAndReturnError(const StringPiece& json, + int options, + int* error_code_out, + std::string* error_msg_out) { + return ReadAndReturnError(json, options, error_code_out, error_msg_out) + .release(); +} + +// static +scoped_ptr<Value> JSONReader::ReadAndReturnError(const StringPiece& json, + int options, + int* error_code_out, + std::string* error_msg_out) { + internal::JSONParser parser(options); + scoped_ptr<Value> root(parser.Parse(json)); + if (!root) { + if (error_code_out) + *error_code_out = parser.error_code(); + if (error_msg_out) + *error_msg_out = parser.GetErrorMessage(); + } - return NULL; + return root; } // static diff --git a/base/json/json_reader.h b/base/json/json_reader.h index 32e76a9..378935a 100644 --- a/base/json/json_reader.h +++ b/base/json/json_reader.h @@ -94,21 +94,30 @@ class BASE_EXPORT JSONReader { // Reads and parses |json|, returning a Value. The caller owns the returned // instance. If |json| is not a properly formed JSON string, returns NULL. - static Value* Read(const StringPiece& json); + static scoped_ptr<Value> Read(const StringPiece& json); + // TODO(estade): remove this bare pointer version. + static Value* DeprecatedRead(const StringPiece& json); // Reads and parses |json|, returning a Value owned by the caller. The // parser respects the given |options|. If the input is not properly formed, // returns NULL. - static Value* Read(const StringPiece& json, int options); + static scoped_ptr<Value> Read(const StringPiece& json, int options); + // TODO(estade): remove this bare pointer version. + static Value* DeprecatedRead(const StringPiece& json, int options); // Reads and parses |json| like Read(). |error_code_out| and |error_msg_out| // are optional. If specified and NULL is returned, they will be populated // an error code and a formatted error message (including error location if // appropriate). Otherwise, they will be unmodified. - static Value* ReadAndReturnError(const StringPiece& json, - int options, // JSONParserOptions - int* error_code_out, - std::string* error_msg_out); + static scoped_ptr<Value> ReadAndReturnError(const StringPiece& json, + int options, // JSONParserOptions + int* error_code_out, + std::string* error_msg_out); + // TODO(estade): remove this bare pointer version. + static Value* DeprecatedReadAndReturnError(const StringPiece& json, + int options, // JSONParserOptions + int* error_code_out, + std::string* error_msg_out); // Converts a JSON parse error code into a human readable message. // Returns an empty string if error_code is JSON_NO_ERROR. diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index e28b94e..7d3a6d9 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc @@ -242,7 +242,7 @@ TEST(JSONReaderTest, Reading) { EXPECT_FALSE(root.get()); // Basic array - root.reset(JSONReader::Read("[true, false, null]")); + root.reset(JSONReader::DeprecatedRead("[true, false, null]")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root.get()); @@ -250,49 +250,53 @@ TEST(JSONReaderTest, Reading) { // Test with trailing comma. Should be parsed the same as above. scoped_ptr<Value> root2; - root2.reset(JSONReader::Read("[true, false, null, ]", - JSON_ALLOW_TRAILING_COMMAS)); + root2.reset(JSONReader::DeprecatedRead("[true, false, null, ]", + JSON_ALLOW_TRAILING_COMMAS)); EXPECT_TRUE(root->Equals(root2.get())); // Empty array - root.reset(JSONReader::Read("[]")); + root.reset(JSONReader::DeprecatedRead("[]")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root.get()); EXPECT_EQ(0U, list->GetSize()); // Nested arrays - root.reset(JSONReader::Read("[[true], [], [false, [], [null]], null]")); + root.reset( + JSONReader::DeprecatedRead("[[true], [], [false, [], [null]], null]")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root.get()); EXPECT_EQ(4U, list->GetSize()); // Lots of trailing commas. - root2.reset(JSONReader::Read("[[true], [], [false, [], [null, ] , ], null,]", - JSON_ALLOW_TRAILING_COMMAS)); + root2.reset(JSONReader::DeprecatedRead( + "[[true], [], [false, [], [null, ] , ], null,]", + JSON_ALLOW_TRAILING_COMMAS)); EXPECT_TRUE(root->Equals(root2.get())); // Invalid, missing close brace. - root.reset(JSONReader::Read("[[true], [], [false, [], [null]], null")); + root.reset( + JSONReader::DeprecatedRead("[[true], [], [false, [], [null]], null")); EXPECT_FALSE(root.get()); // Invalid, too many commas - root.reset(JSONReader::Read("[true,, null]")); + root.reset(JSONReader::DeprecatedRead("[true,, null]")); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("[true,, null]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("[true,, null]", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); // Invalid, no commas - root.reset(JSONReader::Read("[true null]")); + root.reset(JSONReader::DeprecatedRead("[true null]")); EXPECT_FALSE(root.get()); // Invalid, trailing comma - root.reset(JSONReader::Read("[true,]")); + root.reset(JSONReader::DeprecatedRead("[true,]")); EXPECT_FALSE(root.get()); // Valid if we set |allow_trailing_comma| to true. - root.reset(JSONReader::Read("[true,]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset(JSONReader::DeprecatedRead("[true,]", JSON_ALLOW_TRAILING_COMMAS)); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root.get()); @@ -306,21 +310,24 @@ TEST(JSONReaderTest, Reading) { // Don't allow empty elements, even if |allow_trailing_comma| is // true. - root.reset(JSONReader::Read("[,]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset(JSONReader::DeprecatedRead("[,]", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("[true,,]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("[true,,]", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("[,true,]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("[,true,]", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("[true,,false]", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("[true,,false]", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); // Test objects - root.reset(JSONReader::Read("{}")); + root.reset(JSONReader::DeprecatedRead("{}")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); - root.reset(JSONReader::Read( + root.reset(JSONReader::DeprecatedRead( "{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\" }")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); @@ -335,33 +342,35 @@ TEST(JSONReaderTest, Reading) { EXPECT_TRUE(dict_val->GetString("S", &str_val)); EXPECT_EQ("str", str_val); - root2.reset(JSONReader::Read( + root2.reset(JSONReader::DeprecatedRead( "{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\", }", JSON_ALLOW_TRAILING_COMMAS)); ASSERT_TRUE(root2.get()); EXPECT_TRUE(root->Equals(root2.get())); // Test newline equivalence. - root2.reset(JSONReader::Read( + root2.reset(JSONReader::DeprecatedRead( "{\n" " \"number\":9.87654321,\n" " \"null\":null,\n" " \"\\x53\":\"str\",\n" - "}\n", JSON_ALLOW_TRAILING_COMMAS)); + "}\n", + JSON_ALLOW_TRAILING_COMMAS)); ASSERT_TRUE(root2.get()); EXPECT_TRUE(root->Equals(root2.get())); - root2.reset(JSONReader::Read( + root2.reset(JSONReader::DeprecatedRead( "{\r\n" " \"number\":9.87654321,\r\n" " \"null\":null,\r\n" " \"\\x53\":\"str\",\r\n" - "}\r\n", JSON_ALLOW_TRAILING_COMMAS)); + "}\r\n", + JSON_ALLOW_TRAILING_COMMAS)); ASSERT_TRUE(root2.get()); EXPECT_TRUE(root->Equals(root2.get())); // Test nesting - root.reset(JSONReader::Read( + root.reset(JSONReader::DeprecatedRead( "{\"inner\":{\"array\":[true]},\"false\":false,\"d\":{}}")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); @@ -377,13 +386,13 @@ TEST(JSONReaderTest, Reading) { inner_dict = NULL; EXPECT_TRUE(dict_val->GetDictionary("d", &inner_dict)); - root2.reset(JSONReader::Read( + root2.reset(JSONReader::DeprecatedRead( "{\"inner\": {\"array\":[true] , },\"false\":false,\"d\":{},}", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_TRUE(root->Equals(root2.get())); // Test keys with periods - root.reset(JSONReader::Read( + root.reset(JSONReader::DeprecatedRead( "{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); @@ -401,7 +410,7 @@ TEST(JSONReaderTest, Reading) { &integer_value)); EXPECT_EQ(1, integer_value); - root.reset(JSONReader::Read("{\"a\":{\"b\":2},\"a.b\":1}")); + root.reset(JSONReader::DeprecatedRead("{\"a\":{\"b\":2},\"a.b\":1}")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); dict_val = static_cast<DictionaryValue*>(root.get()); @@ -411,45 +420,47 @@ TEST(JSONReaderTest, Reading) { EXPECT_EQ(1, integer_value); // Invalid, no closing brace - root.reset(JSONReader::Read("{\"a\": true")); + root.reset(JSONReader::DeprecatedRead("{\"a\": true")); EXPECT_FALSE(root.get()); // Invalid, keys must be quoted - root.reset(JSONReader::Read("{foo:true}")); + root.reset(JSONReader::DeprecatedRead("{foo:true}")); EXPECT_FALSE(root.get()); // Invalid, trailing comma - root.reset(JSONReader::Read("{\"a\":true,}")); + root.reset(JSONReader::DeprecatedRead("{\"a\":true,}")); EXPECT_FALSE(root.get()); // Invalid, too many commas - root.reset(JSONReader::Read("{\"a\":true,,\"b\":false}")); + root.reset(JSONReader::DeprecatedRead("{\"a\":true,,\"b\":false}")); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("{\"a\":true,,\"b\":false}", - JSON_ALLOW_TRAILING_COMMAS)); + root.reset(JSONReader::DeprecatedRead("{\"a\":true,,\"b\":false}", + JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); // Invalid, no separator - root.reset(JSONReader::Read("{\"a\" \"b\"}")); + root.reset(JSONReader::DeprecatedRead("{\"a\" \"b\"}")); EXPECT_FALSE(root.get()); // Invalid, lone comma. - root.reset(JSONReader::Read("{,}")); + root.reset(JSONReader::DeprecatedRead("{,}")); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("{,}", JSON_ALLOW_TRAILING_COMMAS)); + root.reset(JSONReader::DeprecatedRead("{,}", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("{\"a\":true,,}", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("{\"a\":true,,}", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("{,\"a\":true}", JSON_ALLOW_TRAILING_COMMAS)); + root.reset( + JSONReader::DeprecatedRead("{,\"a\":true}", JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); - root.reset(JSONReader::Read("{\"a\":true,,\"b\":false}", - JSON_ALLOW_TRAILING_COMMAS)); + root.reset(JSONReader::DeprecatedRead("{\"a\":true,,\"b\":false}", + JSON_ALLOW_TRAILING_COMMAS)); EXPECT_FALSE(root.get()); // Test stack overflow std::string evil(1000000, '['); evil.append(std::string(1000000, ']')); - root.reset(JSONReader::Read(evil)); + root.reset(JSONReader::DeprecatedRead(evil)); EXPECT_FALSE(root.get()); // A few thousand adjacent lists is fine. @@ -459,7 +470,7 @@ TEST(JSONReaderTest, Reading) { not_evil.append("[],"); } not_evil.append("[]]"); - root.reset(JSONReader::Read(not_evil)); + root.reset(JSONReader::DeprecatedRead(not_evil)); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root.get()); @@ -521,20 +532,20 @@ TEST(JSONReaderTest, Reading) { } // Test literal root objects. - root.reset(JSONReader::Read("null")); + root.reset(JSONReader::DeprecatedRead("null")); EXPECT_TRUE(root->IsType(Value::TYPE_NULL)); - root.reset(JSONReader::Read("true")); + root.reset(JSONReader::DeprecatedRead("true")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->GetAsBoolean(&bool_value)); EXPECT_TRUE(bool_value); - root.reset(JSONReader::Read("10")); + root.reset(JSONReader::DeprecatedRead("10")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->GetAsInteger(&integer_value)); EXPECT_EQ(10, integer_value); - root.reset(JSONReader::Read("\"root\"")); + root.reset(JSONReader::DeprecatedRead("\"root\"")); ASSERT_TRUE(root.get()); EXPECT_TRUE(root->GetAsString(&str_val)); EXPECT_EQ("root", str_val); @@ -567,7 +578,7 @@ TEST(JSONReaderTest, StringOptimizations) { scoped_ptr<Value> list_value_1; { - scoped_ptr<Value> root(JSONReader::Read( + scoped_ptr<Value> root = JSONReader::Read( "{" " \"test\": {" " \"foo\": true," @@ -579,7 +590,8 @@ TEST(JSONReaderTest, StringOptimizations) { " \"a\"," " \"b\"" " ]" - "}", JSON_DETACHABLE_CHILDREN)); + "}", + JSON_DETACHABLE_CHILDREN); ASSERT_TRUE(root.get()); DictionaryValue* root_dict = NULL; diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc index 3787fdb..5425c7e 100644 --- a/base/json/json_string_value_serializer.cc +++ b/base/json/json_string_value_serializer.cc @@ -50,8 +50,8 @@ JSONStringValueDeserializer::~JSONStringValueDeserializer() {} Value* JSONStringValueDeserializer::Deserialize(int* error_code, std::string* error_str) { - return base::JSONReader::ReadAndReturnError(json_string_, - allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS : - base::JSON_PARSE_RFC, + return base::JSONReader::DeprecatedReadAndReturnError( + json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS + : base::JSON_PARSE_RFC, error_code, error_str); } diff --git a/base/json/json_value_converter_unittest.cc b/base/json/json_value_converter_unittest.cc index 7d48f39..9038610 100644 --- a/base/json/json_value_converter_unittest.cc +++ b/base/json/json_value_converter_unittest.cc @@ -106,7 +106,7 @@ TEST(JSONValueConverterTest, ParseSimpleMessage) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_TRUE(converter.Convert(*value.get(), &message)); @@ -148,7 +148,7 @@ TEST(JSONValueConverterTest, ParseNestedMessage) { " }]\n" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); NestedMessage message; base::JSONValueConverter<NestedMessage> converter; EXPECT_TRUE(converter.Convert(*value.get(), &message)); @@ -190,7 +190,7 @@ TEST(JSONValueConverterTest, ParseFailures) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); @@ -206,7 +206,7 @@ TEST(JSONValueConverterTest, ParseWithMissingFields) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; // Convert() still succeeds even if the input doesn't have "bar" field. @@ -229,7 +229,7 @@ TEST(JSONValueConverterTest, EnumParserFails) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); @@ -246,7 +246,7 @@ TEST(JSONValueConverterTest, RepeatedValueErrorInTheMiddle) { " \"ints\": [1, false]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); + scoped_ptr<Value> value = base::JSONReader::Read(normal_data); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc index 61860fd..a4d7cdc 100644 --- a/base/json/json_value_serializer_unittest.cc +++ b/base/json/json_value_serializer_unittest.cc @@ -75,7 +75,7 @@ void CheckJSONIsStillTheSame(const Value& value) { } void ValidateJsonList(const std::string& json) { - scoped_ptr<Value> root(JSONReader::Read(json)); + scoped_ptr<Value> root = JSONReader::Read(json); ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST)); ListValue* list = static_cast<ListValue*>(root.get()); ASSERT_EQ(1U, list->GetSize()); @@ -379,7 +379,7 @@ TEST(JSONValueSerializerTest, JSONReaderComments) { scoped_ptr<Value> root; // It's ok to have a comment in a string. - root.reset(JSONReader::Read("[\"// ok\\n /* foo */ \"]")); + root.reset(JSONReader::DeprecatedRead("[\"// ok\\n /* foo */ \"]")); ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST)); ListValue* list = static_cast<ListValue*>(root.get()); ASSERT_EQ(1U, list->GetSize()); @@ -390,11 +390,11 @@ TEST(JSONValueSerializerTest, JSONReaderComments) { ASSERT_EQ("// ok\n /* foo */ ", value); // You can't nest comments. - root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]")); + root.reset(JSONReader::DeprecatedRead("/* /* inner */ outer */ [ 1 ]")); ASSERT_FALSE(root.get()); // Not a open comment token. - root.reset(JSONReader::Read("/ * * / [1]")); + root.reset(JSONReader::DeprecatedRead("/ * * / [1]")); ASSERT_FALSE(root.get()); } diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc index e653bf3..d26df69 100644 --- a/base/metrics/statistics_recorder_unittest.cc +++ b/base/metrics/statistics_recorder_unittest.cc @@ -262,7 +262,7 @@ TEST_F(StatisticsRecorderTest, ToJSON) { // Check for valid JSON. scoped_ptr<Value> root; - root.reset(JSONReader::Read(json)); + root.reset(JSONReader::DeprecatedRead(json)); ASSERT_TRUE(root.get()); DictionaryValue* root_dict = NULL; @@ -287,7 +287,7 @@ TEST_F(StatisticsRecorderTest, ToJSON) { std::string query("TestHistogram2"); json = StatisticsRecorder::ToJSON(query); - root.reset(JSONReader::Read(json)); + root.reset(JSONReader::DeprecatedRead(json)); ASSERT_TRUE(root.get()); ASSERT_TRUE(root->GetAsDictionary(&root_dict)); diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc index 3de58e7..e46c2a5 100644 --- a/base/test/trace_event_analyzer.cc +++ b/base/test/trace_event_analyzer.cc @@ -648,7 +648,7 @@ size_t FindMatchingEvents(const std::vector<TraceEvent>& events, bool ParseEventsFromJson(const std::string& json, std::vector<TraceEvent>* output) { scoped_ptr<base::Value> root; - root.reset(base::JSONReader::Read(json)); + root.reset(base::JSONReader::DeprecatedRead(json)); base::ListValue* root_list = NULL; if (!root.get() || !root->GetAsList(&root_list)) diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc index 3e762b9..ebfc494 100644 --- a/base/test/values_test_util.cc +++ b/base/test/values_test_util.cc @@ -64,9 +64,8 @@ namespace test { scoped_ptr<Value> ParseJson(base::StringPiece json) { std::string error_msg; - scoped_ptr<Value> result(base::JSONReader::ReadAndReturnError( - json, base::JSON_ALLOW_TRAILING_COMMAS, - NULL, &error_msg)); + scoped_ptr<Value> result = base::JSONReader::ReadAndReturnError( + json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); if (!result) { ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg; result = Value::CreateNullValue(); diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc index 1f075b7..bfd06730 100644 --- a/base/trace_event/trace_event_unittest.cc +++ b/base/trace_event/trace_event_unittest.cc @@ -168,8 +168,8 @@ void TraceEventTestFixture::OnTraceDataCollected( trace_buffer_.Finish(); scoped_ptr<Value> root; - root.reset(base::JSONReader::Read(json_output_.json_output, - JSON_PARSE_RFC | JSON_DETACHABLE_CHILDREN)); + root.reset(base::JSONReader::DeprecatedRead( + json_output_.json_output, JSON_PARSE_RFC | JSON_DETACHABLE_CHILDREN)); if (!root.get()) { LOG(ERROR) << json_output_.json_output; diff --git a/chrome/browser/android/policy/policy_manager.cc b/chrome/browser/android/policy/policy_manager.cc index a882b77..62dbf405 100644 --- a/chrome/browser/android/policy/policy_manager.cc +++ b/chrome/browser/android/policy/policy_manager.cc @@ -158,9 +158,10 @@ base::Value* PolicyManager::ConvertValueToSchema(base::Value* raw_value, case base::Value::TYPE_LIST: { std::string string_value; if (value->GetAsString(&string_value)) { - base::Value* decoded_value = base::JSONReader::Read(string_value); + scoped_ptr<base::Value> decoded_value = + base::JSONReader::Read(string_value); if (decoded_value) - return decoded_value; + return decoded_value.release(); } return value.release(); } diff --git a/chrome/browser/chromeos/boot_times_recorder.cc b/chrome/browser/chromeos/boot_times_recorder.cc index 268aef6..ccb5fa3 100644 --- a/chrome/browser/chromeos/boot_times_recorder.cc +++ b/chrome/browser/chromeos/boot_times_recorder.cc @@ -166,7 +166,7 @@ BootTimesRecorder::Stats BootTimesRecorder::Stats::DeserializeFromString( if (source.empty()) return Stats(); - scoped_ptr<base::Value> value(base::JSONReader::Read(source)); + scoped_ptr<base::Value> value = base::JSONReader::Read(source); base::DictionaryValue* dictionary; if (!value || !value->GetAsDictionary(&dictionary)) { LOG(ERROR) << "BootTimesRecorder::Stats::DeserializeFromString(): not a " diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc index bec7f55..92f5753 100644 --- a/chrome/browser/chromeos/customization/customization_document.cc +++ b/chrome/browser/chromeos/customization/customization_document.cc @@ -222,8 +222,8 @@ bool CustomizationDocument::LoadManifestFromString( const std::string& manifest) { int error_code = 0; std::string error; - scoped_ptr<base::Value> root(base::JSONReader::ReadAndReturnError(manifest, - base::JSON_ALLOW_TRAILING_COMMAS, &error_code, &error)); + scoped_ptr<base::Value> root = base::JSONReader::ReadAndReturnError( + manifest, base::JSON_ALLOW_TRAILING_COMMAS, &error_code, &error); if (error_code != base::JSONReader::JSON_NO_ERROR) LOG(ERROR) << error; DCHECK(root.get() != NULL); diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 5546d59..6468976 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -660,7 +660,7 @@ void FileManagerBrowserTestBase::RunTestMessageLoop() { // Parse the message value as JSON. const scoped_ptr<const base::Value> value( - base::JSONReader::Read(entry.message)); + base::JSONReader::DeprecatedRead(entry.message)); // If the message is not the expected format, just ignore it. const base::DictionaryValue* message_dictionary = NULL; diff --git a/chrome/browser/chromeos/file_manager/url_util_unittest.cc b/chrome/browser/chromeos/file_manager/url_util_unittest.cc index 569617d..a23ee30 100644 --- a/chrome/browser/chromeos/file_manager/url_util_unittest.cc +++ b/chrome/browser/chromeos/file_manager/url_util_unittest.cc @@ -21,7 +21,7 @@ namespace { std::string PrettyPrintEscapedJson(const std::string& query) { const std::string json = net::UnescapeURLComponent( query, net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS); - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); std::string pretty_json; base::JSONWriter::WriteWithOptions( *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &pretty_json); diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc index f8f2545..765e742 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc @@ -43,8 +43,8 @@ void CreateRequestValueFromJSON(const std::string& json, int json_error_code; std::string json_error_msg; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( - json, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + json, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg); ASSERT_TRUE(value.get()) << json_error_msg; base::ListValue* value_as_list; diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc index ecf38a1..ba1c19c 100644 --- a/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc +++ b/chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc @@ -82,8 +82,8 @@ void CreateRequestValueFromJSON(const std::string& json, int json_error_code; std::string json_error_msg; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( - json, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + json, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg); ASSERT_TRUE(value.get()) << json_error_msg; base::ListValue* value_as_list; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index b5ef31e..69696fc 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -131,8 +131,8 @@ base::string16 NetworkStateHelper::GetCurrentNetworkName() const { void NetworkStateHelper::CreateNetworkFromOnc( const std::string& onc_spec) const { std::string error; - scoped_ptr<base::Value> root(base::JSONReader::ReadAndReturnError( - onc_spec, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error)); + scoped_ptr<base::Value> root = base::JSONReader::ReadAndReturnError( + onc_spec, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error); base::DictionaryValue* toplevel_onc = nullptr; if (!root || !root->GetAsDictionary(&toplevel_onc)) { diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc index 02b0b53..9e9daa7 100644 --- a/chrome/browser/chromeos/mobile/mobile_activator.cc +++ b/chrome/browser/chromeos/mobile/mobile_activator.cc @@ -127,8 +127,8 @@ bool CellularConfigDocument::LoadFromFile(const base::FilePath& config_path) { if (!base::ReadFileToString(config_path, &config)) return false; - scoped_ptr<base::Value> root( - base::JSONReader::Read(config, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> root(base::JSONReader::DeprecatedRead( + config, base::JSON_ALLOW_TRAILING_COMMAS)); DCHECK(root.get() != NULL); if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) { LOG(WARNING) << "Bad cellular config file"; diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc index 549bfa0..56dd828 100644 --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc @@ -358,10 +358,9 @@ TEST_F(LoginScreenPowerManagementPolicyHandlerTest, Empty) { TEST_F(LoginScreenPowerManagementPolicyHandlerTest, ValidPolicy) { PolicyMap policy_map; - policy_map.Set(key::kDeviceLoginScreenPowerManagement, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - base::JSONReader::Read(kLoginScreenPowerManagementPolicy), + policy_map.Set(key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY, + POLICY_SCOPE_USER, base::JSONReader::DeprecatedRead( + kLoginScreenPowerManagementPolicy), NULL); LoginScreenPowerManagementPolicyHandler handler(chrome_schema_); PolicyErrorMap errors; diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 24509fc..b09544f 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -1724,7 +1724,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) { ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_, get_locale_list, &json)); - scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value_ptr = base::JSONReader::Read(json); const base::ListValue* locales = NULL; ASSERT_TRUE(value_ptr); ASSERT_TRUE(value_ptr->GetAsList(&locales)); @@ -1783,7 +1783,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) { ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_, get_locale_list, &json)); - value_ptr.reset(base::JSONReader::Read(json)); + value_ptr.reset(base::JSONReader::DeprecatedRead(json)); locales = NULL; ASSERT_TRUE(value_ptr); ASSERT_TRUE(value_ptr->GetAsList(&locales)); @@ -1867,7 +1867,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) { user_id_1_.c_str()), &json)); LOG(ERROR) << json; - value_ptr.reset(base::JSONReader::Read(json)); + value_ptr.reset(base::JSONReader::DeprecatedRead(json)); const base::DictionaryValue* state = NULL; ASSERT_TRUE(value_ptr); ASSERT_TRUE(value_ptr->GetAsDictionary(&state)); @@ -2282,7 +2282,7 @@ IN_PROC_BROWSER_TEST_P(TermsOfServiceDownloadTest, TermsOfServiceScreen) { " observer.observe(screenElement, options);" "}", &json)); - scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value_ptr = base::JSONReader::Read(json); const base::DictionaryValue* status = NULL; ASSERT_TRUE(value_ptr); ASSERT_TRUE(value_ptr->GetAsDictionary(&status)); diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc index e8c604e..6867fea 100644 --- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc +++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc @@ -55,8 +55,8 @@ scoped_ptr<base::Value> DecodeJsonStringAndDropUnknownBySchema( const std::string& json_string, const std::string& policy_name) { std::string error; - base::Value* root(base::JSONReader::ReadAndReturnError( - json_string, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error)); + scoped_ptr<base::Value> root = base::JSONReader::ReadAndReturnError( + json_string, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error); if (!root) { LOG(WARNING) << "Invalid JSON string: " << error << ", ignoring."; @@ -72,8 +72,8 @@ scoped_ptr<base::Value> DecodeJsonStringAndDropUnknownBySchema( std::string error_path; bool changed = false; - if (!schema.Normalize( - root, SCHEMA_ALLOW_UNKNOWN, &error_path, &error, &changed)) { + if (!schema.Normalize(root.get(), SCHEMA_ALLOW_UNKNOWN, &error_path, &error, + &changed)) { LOG(WARNING) << "Invalid policy value for " << policy_name << ": " << error << " at " << error_path << "."; return scoped_ptr<base::Value>(); @@ -89,7 +89,7 @@ scoped_ptr<base::Value> DecodeJsonStringAndDropUnknownBySchema( return scoped_ptr<base::Value>(); } - return scoped_ptr<base::Value>(root); + return root; } base::Value* DecodeConnectionType(int value) { diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 0cf740f..e862023 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -707,12 +707,12 @@ TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeOnly) { TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeAndPunycode) { TestingProfile profile; - scoped_ptr<base::Value> value(base::JSONReader::Read( + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedRead( "{\"[*.]\\xC4\\x87ira.com,*\":{\"images\":1}}")); profile.GetPrefs()->Set(prefs::kContentSettingsPatternPairs, *value); // Set punycode equivalent, with different setting. - scoped_ptr<base::Value> puny_value(base::JSONReader::Read( + scoped_ptr<base::Value> puny_value(base::JSONReader::DeprecatedRead( "{\"[*.]xn--ira-ppa.com,*\":{\"images\":2}}")); profile.GetPrefs()->Set( prefs::kContentSettingsPatternPairs, *puny_value); diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc index deaf9d6..9e82025 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.cc +++ b/chrome/browser/devtools/device/devtools_android_bridge.cc @@ -157,7 +157,7 @@ void DevToolsAndroidBridge::DiscoveryRequest::ReceivedVersion( if (result < 0) return; // Parse version, append to package name if available, - scoped_ptr<base::Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response); base::DictionaryValue* dict; if (value && value->GetAsDictionary(&dict)) { std::string browser_name; @@ -184,7 +184,7 @@ void DevToolsAndroidBridge::DiscoveryRequest::ReceivedPages( DCHECK_CURRENTLY_ON(BrowserThread::UI); if (result < 0) return; - scoped_ptr<base::Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response); base::ListValue* list_value; if (value && value->GetAsList(&list_value)) { for (const auto& page_value : *list_value) { diff --git a/chrome/browser/devtools/devtools_protocol.cc b/chrome/browser/devtools/devtools_protocol.cc index 5687220..c478040 100644 --- a/chrome/browser/devtools/devtools_protocol.cc +++ b/chrome/browser/devtools/devtools_protocol.cc @@ -93,7 +93,7 @@ bool DevToolsProtocol::ParseNotification( const std::string& json, std::string* method, scoped_ptr<base::DictionaryValue>* params) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) return false; @@ -115,7 +115,7 @@ bool DevToolsProtocol::ParseNotification( bool DevToolsProtocol::ParseResponse(const std::string& json, int* command_id, int* error_code) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) return false; diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc index 69ab19f..79a534d 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.cc +++ b/chrome/browser/devtools/devtools_ui_bindings.cc @@ -481,7 +481,7 @@ void DevToolsUIBindings::HandleMessageFromDevToolsFrontend( base::ListValue* params = &empty_params; base::DictionaryValue* dict = NULL; - scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message)); + scoped_ptr<base::Value> parsed_message = base::JSONReader::Read(message); if (!parsed_message || !parsed_message->GetAsDictionary(&dict) || !dict->GetString(kFrontendHostMethod, &method) || diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index f9b25a4..744cf0e 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -200,7 +200,7 @@ class DevToolsEventForwarder { void DevToolsEventForwarder::SetWhitelistedShortcuts( const std::string& message) { - scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message)); + scoped_ptr<base::Value> parsed_message = base::JSONReader::Read(message); base::ListValue* shortcut_list; if (!parsed_message->GetAsList(&shortcut_list)) return; diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc index 4e53e5a..61e5b3b 100644 --- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc +++ b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc @@ -161,13 +161,12 @@ void BookmarkImageServiceAndroid::RetrieveSalientImageFromContextCallback( return; } - scoped_ptr<base::Value> json_data; int error_code = 0; - std::string errorMessage; - json_data.reset(base::JSONReader::ReadAndReturnError( - json, base::JSON_PARSE_RFC, &error_code, &errorMessage)); + std::string error_message; + scoped_ptr<base::Value> json_data = base::JSONReader::ReadAndReturnError( + json, base::JSON_PARSE_RFC, &error_code, &error_message); if (error_code || !json_data) { - LOG(WARNING) << "JSON parse error: " << errorMessage.c_str() << json; + LOG(WARNING) << "JSON parse error: " << error_message << json; return; } diff --git a/chrome/browser/extensions/activity_log/counting_policy.cc b/chrome/browser/extensions/activity_log/counting_policy.cc index 7236065..e5b0225 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.cc +++ b/chrome/browser/extensions/activity_log/counting_policy.cc @@ -497,7 +497,7 @@ scoped_ptr<Action::ActionVector> CountingPolicy::DoReadFilteredData( if (query.ColumnType(4) != sql::COLUMN_TYPE_NULL) { scoped_ptr<base::Value> parsed_value( - base::JSONReader::Read(query.ColumnString(4))); + base::JSONReader::DeprecatedRead(query.ColumnString(4))); if (parsed_value && parsed_value->IsType(base::Value::TYPE_LIST)) { action->set_args(make_scoped_ptr( static_cast<base::ListValue*>(parsed_value.release()))); @@ -510,7 +510,7 @@ scoped_ptr<Action::ActionVector> CountingPolicy::DoReadFilteredData( if (query.ColumnType(8) != sql::COLUMN_TYPE_NULL) { scoped_ptr<base::Value> parsed_value( - base::JSONReader::Read(query.ColumnString(8))); + base::JSONReader::DeprecatedRead(query.ColumnString(8))); if (parsed_value && parsed_value->IsType(base::Value::TYPE_DICTIONARY)) { action->set_other(make_scoped_ptr( static_cast<base::DictionaryValue*>(parsed_value.release()))); diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index 03b1e19..9996fa5 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc @@ -195,7 +195,7 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData( if (query.ColumnType(4) != sql::COLUMN_TYPE_NULL) { scoped_ptr<base::Value> parsed_value( - base::JSONReader::Read(query.ColumnString(4))); + base::JSONReader::DeprecatedRead(query.ColumnString(4))); if (parsed_value && parsed_value->IsType(base::Value::TYPE_LIST)) { action->set_args(make_scoped_ptr( static_cast<base::ListValue*>(parsed_value.release()))); @@ -208,7 +208,7 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData( if (query.ColumnType(8) != sql::COLUMN_TYPE_NULL) { scoped_ptr<base::Value> parsed_value( - base::JSONReader::Read(query.ColumnString(8))); + base::JSONReader::DeprecatedRead(query.ColumnString(8))); if (parsed_value && parsed_value->IsType(base::Value::TYPE_DICTIONARY)) { action->set_other(make_scoped_ptr( static_cast<base::DictionaryValue*>(parsed_value.release()))); diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 7d38197..e00cd84 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -440,7 +440,7 @@ void ExtensionDevToolsClientHost::DispatchProtocolMessage( if (!EventRouter::Get(profile_)) return; - scoped_ptr<base::Value> result(base::JSONReader::Read(message)); + scoped_ptr<base::Value> result = base::JSONReader::Read(message); if (!result->IsType(base::Value::TYPE_DICTIONARY)) return; base::DictionaryValue* dictionary = diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc index df9b96f..0f1ecf8 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc @@ -527,9 +527,9 @@ TEST_F(WebRequestRulesRegistryTest, IgnoreRulesByTag) { " \"priority\": 300 \n" "} "; - scoped_ptr<base::Value> value1(base::JSONReader::Read(kRule1)); + scoped_ptr<base::Value> value1 = base::JSONReader::Read(kRule1); ASSERT_TRUE(value1.get()); - scoped_ptr<base::Value> value2(base::JSONReader::Read(kRule2)); + scoped_ptr<base::Value> value2 = base::JSONReader::Read(kRule2); ASSERT_TRUE(value2.get()); std::vector<linked_ptr<RulesRegistry::Rule> > rules; @@ -696,7 +696,7 @@ TEST(WebRequestRulesRegistrySimpleTest, StageChecker) { " \"priority\": 200 \n" "} "; - scoped_ptr<base::Value> value(base::JSONReader::Read(kRule)); + scoped_ptr<base::Value> value = base::JSONReader::Read(kRule); ASSERT_TRUE(value); RulesRegistry::Rule rule; @@ -730,7 +730,7 @@ TEST(WebRequestRulesRegistrySimpleTest, HostPermissionsChecker) { " \"instanceType\": \"declarativeWebRequest.RedirectRequest\",\n" " \"redirectUrl\": \"http://bar.com\" \n" "} "; - scoped_ptr<base::Value> action_value(base::JSONReader::Read(kAction)); + scoped_ptr<base::Value> action_value = base::JSONReader::Read(kAction); ASSERT_TRUE(action_value); WebRequestActionSet::AnyVector actions; @@ -786,7 +786,7 @@ TEST_F(WebRequestRulesRegistryTest, CheckOriginAndPathRegEx) { " \"priority\": 200 \n" "} "; - scoped_ptr<base::Value> value(base::JSONReader::Read(kRule)); + scoped_ptr<base::Value> value = base::JSONReader::Read(kRule); ASSERT_TRUE(value.get()); std::vector<linked_ptr<RulesRegistry::Rule> > rules; diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index c7ea81d..af325f3 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -100,12 +100,11 @@ class DownloadsEventsListener : public content::NotificationObserver { const std::string& event_name, const std::string& json_args, base::Time caught) - : profile_(profile), - event_name_(event_name), - json_args_(json_args), - args_(base::JSONReader::Read(json_args)), - caught_(caught) { - } + : profile_(profile), + event_name_(event_name), + json_args_(json_args), + args_(base::JSONReader::DeprecatedRead(json_args)), + caught_(caught) {} const base::Time& caught() { return caught_; } diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc index 434ab8e..12360aa 100644 --- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc @@ -201,7 +201,7 @@ class FakeGCDApiFlowFactory return; } - scoped_ptr<base::Value> response(base::JSONReader::Read(response_str)); + scoped_ptr<base::Value> response = base::JSONReader::Read(response_str); ASSERT_TRUE(response); base::DictionaryValue* response_dict; diff --git a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc index 0fbc770..f6734ef 100644 --- a/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc +++ b/chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc @@ -52,7 +52,7 @@ class EchoHost : public NativeMessageHost { void OnMessage(const std::string& request_string) override { scoped_ptr<base::Value> request_value( - base::JSONReader::Read(request_string)); + base::JSONReader::DeprecatedRead(request_string)); scoped_ptr<base::DictionaryValue> request( static_cast<base::DictionaryValue*>(request_value.release())); if (request_string.find("stopHostTest") != std::string::npos) { diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index 55afb31..3bc06cb 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -113,7 +113,7 @@ class NativeMessagingTest : public ::testing::Test, last_message_ = message; // Parse the message. - base::Value* parsed = base::JSONReader::Read(message); + base::Value* parsed = base::JSONReader::DeprecatedRead(message); base::DictionaryValue* dict_value; if (parsed && parsed->GetAsDictionary(&dict_value)) { last_message_parsed_.reset(dict_value); diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc index 13ce9b1..a48d7db 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc @@ -88,7 +88,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet( std::string permission_arg = it->substr(delimiter + 1); scoped_ptr<base::Value> permission_json( - base::JSONReader::Read(permission_arg)); + base::JSONReader::DeprecatedRead(permission_arg)); if (!permission_json.get()) { *error = ErrorUtils::FormatErrorMessage(kInvalidParameter, *it); return NULL; diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc b/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc index ef3ec91..c9e5da1 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc +++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc @@ -90,7 +90,7 @@ bool SettingsPrivateDelegate::SetPref(const std::string& pref_name, if (!value->GetAsString(&json_string)) return false; - temp_value.reset(base::JSONReader::Read(json_string)); + temp_value.reset(base::JSONReader::DeprecatedRead(json_string)); value = temp_value.get(); if (!value->IsType(base::Value::TYPE_LIST)) return false; diff --git a/chrome/browser/extensions/api/storage/setting_sync_data.cc b/chrome/browser/extensions/api/storage/setting_sync_data.cc index ff65daf..cf7cbf6 100644 --- a/chrome/browser/extensions/api/storage/setting_sync_data.cc +++ b/chrome/browser/extensions/api/storage/setting_sync_data.cc @@ -51,7 +51,7 @@ void SettingSyncData::ExtractSyncData(const syncer::SyncData& sync_data) { extension_id_ = extension_specifics.extension_id(); key_ = extension_specifics.key(); - value_.reset(base::JSONReader::Read(extension_specifics.value())); + value_ = base::JSONReader::Read(extension_specifics.value()); if (!value_) { LOG(WARNING) << "Specifics for " << extension_id_ << "/" << key_ diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 934a9e9..81e586e 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -582,7 +582,8 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) { // Contents of formData. const char kFormData[] = "{\"A\":[\"test text\"],\"B\":[\"\"],\"C\":[\"test password\"]}"; - scoped_ptr<const base::Value> form_data(base::JSONReader::Read(kFormData)); + scoped_ptr<const base::Value> form_data( + base::JSONReader::DeprecatedRead(kFormData)); ASSERT_TRUE(form_data.get() != NULL); ASSERT_TRUE(form_data->GetType() == base::Value::TYPE_DICTIONARY); // Contents of raw. diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 805019b..b1d5d03 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -159,7 +159,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, MAYBE_IsInstalled) { kGetAppDetails, &result)); scoped_ptr<base::DictionaryValue> app_details( - static_cast<base::DictionaryValue*>(base::JSONReader::Read(result))); + static_cast<base::DictionaryValue*>( + base::JSONReader::DeprecatedRead(result))); // extension->manifest() does not contain the id. app_details->Remove("id", NULL); EXPECT_TRUE(app_details.get()); @@ -238,7 +239,8 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) { &json)); scoped_ptr<base::DictionaryValue> app_details( - static_cast<base::DictionaryValue*>(base::JSONReader::Read(json))); + static_cast<base::DictionaryValue*>( + base::JSONReader::DeprecatedRead(json))); // extension->manifest() does not contain the id. app_details->Remove("id", NULL); EXPECT_TRUE(app_details.get()); diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index ae9560a..9403b17 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -48,7 +48,7 @@ class TestFunctionDispatcherDelegate namespace extension_function_test_utils { base::Value* ParseJSON(const std::string& data) { - return base::JSONReader::Read(data); + return base::JSONReader::DeprecatedRead(data); } base::ListValue* ParseList(const std::string& data) { diff --git a/chrome/browser/extensions/extension_management_unittest.cc b/chrome/browser/extensions/extension_management_unittest.cc index 1db99a0..804e91c 100644 --- a/chrome/browser/extensions/extension_management_unittest.cc +++ b/chrome/browser/extensions/extension_management_unittest.cc @@ -149,11 +149,9 @@ class ExtensionManagementServiceTest : public testing::Test { void SetExampleDictPref() { std::string error_msg; - scoped_ptr<base::Value> parsed(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> parsed = base::JSONReader::ReadAndReturnError( kExampleDictPreference, - base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, - NULL, - &error_msg)); + base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg); ASSERT_TRUE(parsed && parsed->IsType(base::Value::TYPE_DICTIONARY)) << error_msg; SetPref(true, pref_names::kExtensionManagement, parsed.release()); diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc index afb88cc..7214343 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc @@ -434,7 +434,7 @@ void InstallSigner::ParseFetchResponse() { // could not be verified to be in the webstore. base::DictionaryValue* dictionary = NULL; - scoped_ptr<base::Value> parsed(base::JSONReader::Read(response)); + scoped_ptr<base::Value> parsed = base::JSONReader::Read(response); bool json_success = parsed.get() && parsed->GetAsDictionary(&dictionary); UMA_HISTOGRAM_BOOLEAN("ExtensionInstallSigner.ParseJsonSuccess", json_success); diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc index 09b2d19..a5fb830 100644 --- a/chrome/browser/extensions/policy_handlers_unittest.cc +++ b/chrome/browser/extensions/policy_handlers_unittest.cc @@ -300,11 +300,9 @@ TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) { std::string error; - scoped_ptr<base::Value> policy_value(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> policy_value = base::JSONReader::ReadAndReturnError( kTestManagementPolicy1, - base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, - NULL, - &error)); + base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, NULL, &error); ASSERT_TRUE(policy_value.get()) << error; policy::Schema chrome_schema = @@ -325,11 +323,9 @@ TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) { TEST(ExtensionSettingsPolicyHandlerTest, ApplyPolicySettings) { std::string error; - scoped_ptr<base::Value> policy_value(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> policy_value = base::JSONReader::ReadAndReturnError( kTestManagementPolicy2, - base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, - NULL, - &error)); + base::JSONParserOptions::JSON_ALLOW_TRAILING_COMMAS, NULL, &error); ASSERT_TRUE(policy_value.get()) << error; policy::Schema chrome_schema = diff --git a/chrome/browser/local_discovery/cloud_device_list_unittest.cc b/chrome/browser/local_discovery/cloud_device_list_unittest.cc index 38d116d..f39efff 100644 --- a/chrome/browser/local_discovery/cloud_device_list_unittest.cc +++ b/chrome/browser/local_discovery/cloud_device_list_unittest.cc @@ -66,7 +66,7 @@ TEST(CloudDeviceListTest, Parsing) { EXPECT_CALL(delegate, OnDeviceListReady(_)).WillOnce(SaveArg<0>(&devices)); scoped_ptr<base::Value> value( - base::JSONReader::Read(kSampleSuccessResponseOAuth)); + base::JSONReader::DeprecatedRead(kSampleSuccessResponseOAuth)); const base::DictionaryValue* dictionary = NULL; ASSERT_TRUE(value->GetAsDictionary(&dictionary)); device_list.OnGCDAPIFlowComplete(*dictionary); diff --git a/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc b/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc index b652bb5..c57c5a6 100644 --- a/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc +++ b/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc @@ -52,7 +52,7 @@ TEST(CloudPrintPrinterListTest, Parsing) { EXPECT_CALL(delegate, OnDeviceListReady(_)).WillOnce(SaveArg<0>(&devices)); scoped_ptr<base::Value> value( - base::JSONReader::Read(kSampleSuccessResponseOAuth)); + base::JSONReader::DeprecatedRead(kSampleSuccessResponseOAuth)); const base::DictionaryValue* dictionary = NULL; ASSERT_TRUE(value->GetAsDictionary(&dictionary)); device_list.OnGCDAPIFlowComplete(*dictionary); diff --git a/chrome/browser/local_discovery/gcd_registration_ticket_request_unittest.cc b/chrome/browser/local_discovery/gcd_registration_ticket_request_unittest.cc index e9ec43b..5704917 100644 --- a/chrome/browser/local_discovery/gcd_registration_ticket_request_unittest.cc +++ b/chrome/browser/local_discovery/gcd_registration_ticket_request_unittest.cc @@ -53,14 +53,14 @@ TEST(GCDRegistrationTicketRequestTest, Parsing) { EXPECT_CALL(delegate, Callback("SampleTicketID", "SampleDeviceID")); - scoped_ptr<base::Value> value(base::JSONReader::Read(kSampleResponse)); + scoped_ptr<base::Value> value = base::JSONReader::Read(kSampleResponse); const base::DictionaryValue* dictionary = NULL; ASSERT_TRUE(value->GetAsDictionary(&dictionary)); request.OnGCDAPIFlowComplete(*dictionary); EXPECT_CALL(delegate, Callback("", "")); - value.reset(base::JSONReader::Read(kErrorResponse)); + value.reset(base::JSONReader::DeprecatedRead(kErrorResponse)); ASSERT_TRUE(value->GetAsDictionary(&dictionary)); request.OnGCDAPIFlowComplete(*dictionary); } diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc b/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc index 19f828a..1a087e2 100644 --- a/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc +++ b/chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc @@ -47,14 +47,15 @@ TEST(PrivetConfirmApiFlowTest, Parsing) { "123", base::Bind(&MockDelegate::Callback, base::Unretained(&delegate))); EXPECT_CALL(delegate, Callback(GCDApiFlow::SUCCESS)).Times(1); - scoped_ptr<base::Value> value(base::JSONReader::Read(kSampleConfirmResponse)); + scoped_ptr<base::Value> value = + base::JSONReader::Read(kSampleConfirmResponse); const base::DictionaryValue* dictionary = NULL; ASSERT_TRUE(value->GetAsDictionary(&dictionary)); confirmation.OnGCDAPIFlowComplete(*dictionary); EXPECT_CALL(delegate, Callback(GCDApiFlow::ERROR_FROM_SERVER)).Times(1); - value.reset(base::JSONReader::Read(kFailedConfirmResponse)); + value.reset(base::JSONReader::DeprecatedRead(kFailedConfirmResponse)); ASSERT_TRUE(value->GetAsDictionary(&dictionary)); confirmation.OnGCDAPIFlowComplete(*dictionary); } diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc index 9fe8500d..6c986fb 100644 --- a/chrome/browser/local_discovery/privet_http_unittest.cc +++ b/chrome/browser/local_discovery/privet_http_unittest.cc @@ -220,7 +220,7 @@ const char kSampleCJTDuplex[] = // string. std::string NormalizeJson(const std::string& json) { std::string result = json; - scoped_ptr<base::Value> value(base::JSONReader::Read(result)); + scoped_ptr<base::Value> value = base::JSONReader::Read(result); DCHECK(value); base::JSONWriter::Write(*value, &result); return result; diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc index e7647c4..337275a 100644 --- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc @@ -89,11 +89,9 @@ class WebRtcGetMediaDevicesBrowserTest int error_code; std::string error_message; - scoped_ptr<base::Value> value( - base::JSONReader::ReadAndReturnError(devices_as_json, - base::JSON_ALLOW_TRAILING_COMMAS, - &error_code, - &error_message)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + devices_as_json, base::JSON_ALLOW_TRAILING_COMMAS, &error_code, + &error_message); ASSERT_TRUE(value.get() != NULL) << error_message; EXPECT_EQ(value->GetType(), base::Value::TYPE_LIST); diff --git a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc index b48c9e9..107c25f 100644 --- a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc @@ -59,7 +59,7 @@ class WebRtcPerfBrowserTest : public WebRtcTestBase { " JSON.stringify(peerConnectionDataStore));", webrtc_internals_tab); - base::Value* parsed_json = base::JSONReader::Read(all_stats_json); + base::Value* parsed_json = base::JSONReader::DeprecatedRead(all_stats_json); base::DictionaryValue* result; if (parsed_json && parsed_json->GetAsDictionary(&result)) return result; diff --git a/chrome/browser/net/net_log_temp_file_unittest.cc b/chrome/browser/net/net_log_temp_file_unittest.cc index a620bc6..772ac61 100644 --- a/chrome/browser/net/net_log_temp_file_unittest.cc +++ b/chrome/browser/net/net_log_temp_file_unittest.cc @@ -118,7 +118,7 @@ class NetLogTempFileTest : public ::testing::Test { std::string log; ASSERT_TRUE(ReadFileToString(net_export_log_, &log)); base::JSONReader reader; - scoped_ptr<base::Value> json(base::JSONReader::Read(log)); + scoped_ptr<base::Value> json = base::JSONReader::Read(log); EXPECT_TRUE(json); } diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 668e9fd..dc6ec05 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -191,8 +191,8 @@ base::DictionaryValue* PluginFinder::LoadBuiltInPluginList() { IDR_PLUGIN_DB_JSON)); std::string error_str; int error_code = base::JSONReader::JSON_NO_ERROR; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( - json_resource, base::JSON_PARSE_RFC, &error_code, &error_str)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + json_resource, base::JSON_PARSE_RFC, &error_code, &error_str); if (!value) { DLOG(ERROR) << error_str; switch (error_code) { diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc index 7737e71..b232f6e 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc +++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc @@ -31,10 +31,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, ApplyPolicySettings) { EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL)); PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - base::JSONReader::Read( + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, + base::JSONReader::DeprecatedRead( "[" " {" " \"name\": \"Google\"," @@ -129,10 +127,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) { #if defined(ENABLE_EXTENSIONS) TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) { PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - base::JSONReader::Read( + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, + base::JSONReader::DeprecatedRead( "[" " {" " \"name\": \"Google\"," @@ -160,10 +156,8 @@ TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) { #if defined(ENABLE_EXTENSIONS) TEST_F(ManagedBookmarksPolicyHandlerTest, BadBookmark) { PolicyMap policy; - policy.Set(key::kManagedBookmarks, - POLICY_LEVEL_MANDATORY, - POLICY_SCOPE_USER, - base::JSONReader::Read( + policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, + base::JSONReader::DeprecatedRead( "[" " {" " \"name\": \"Empty\"," diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc index 0ade659..e34a06f 100644 --- a/chrome/browser/policy/policy_prefs_browsertest.cc +++ b/chrome/browser/policy/policy_prefs_browsertest.cc @@ -231,8 +231,8 @@ class PolicyTestCases { int error_code = -1; std::string error_string; base::DictionaryValue* dict = NULL; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( - json, base::JSON_PARSE_RFC, &error_code, &error_string)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + json, base::JSON_PARSE_RFC, &error_code, &error_string); if (!value.get() || !value->GetAsDictionary(&dict)) { ADD_FAILURE() << "Error parsing policy_test_cases.json: " << error_string; return; @@ -426,7 +426,7 @@ void VerifyControlledSettingIndicators(Browser* browser, // |selector| as JSON. ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents, javascript.str(), &json)); - scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value_ptr = base::JSONReader::Read(json); const base::ListValue* indicators = NULL; ASSERT_TRUE(value_ptr.get()); ASSERT_TRUE(value_ptr->GetAsList(&indicators)); diff --git a/chrome/browser/prefs/prefs_syncable_service_unittest.cc b/chrome/browser/prefs/prefs_syncable_service_unittest.cc index fd47a43..af8a057 100644 --- a/chrome/browser/prefs/prefs_syncable_service_unittest.cc +++ b/chrome/browser/prefs/prefs_syncable_service_unittest.cc @@ -164,7 +164,7 @@ class PrefsSyncableServiceTest : public testing::Test { syncer::SyncChangeList::const_iterator it = list.begin(); for (; it != list.end(); ++it) { if (syncer::SyncDataLocal(it->sync_data()).GetTag() == name) { - return make_scoped_ptr(base::JSONReader::Read( + return make_scoped_ptr(base::JSONReader::DeprecatedRead( it->sync_data().GetSpecifics().preference().value())); } } @@ -217,7 +217,7 @@ TEST_F(PrefsSyncableServiceTest, CreatePrefSyncData) { preference()); EXPECT_EQ(std::string(prefs::kHomePage), specifics.name()); - scoped_ptr<base::Value> value(base::JSONReader::Read(specifics.value())); + scoped_ptr<base::Value> value = base::JSONReader::Read(specifics.value()); EXPECT_TRUE(pref->GetValue()->Equals(value.get())); } diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index 2b16e5c..f859b1f 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -132,7 +132,7 @@ void CloudPrintProxyService::GetPrinters(const PrintersCallback& callback) { if (!list_path.empty()) { std::string printers_json; base::ReadFileToString(list_path, &printers_json); - scoped_ptr<base::Value> value(base::JSONReader::Read(printers_json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(printers_json); base::ListValue* list = NULL; std::vector<std::string> printers; if (value && value->GetAsList(&list) && list) { diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index bf4d4ff..a708193 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -177,7 +177,7 @@ namespace internal_cloud_print_helpers { // parameters. bool GetPageSetupParameters(const std::string& json, PrintMsg_Print_Params& parameters) { - scoped_ptr<base::Value> parsed_value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> parsed_value = base::JSONReader::Read(json); DLOG_IF(ERROR, (!parsed_value.get() || !parsed_value->IsType(base::Value::TYPE_DICTIONARY))) << "PageSetup call didn't have expected contents"; diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 0166e97..ff53d44 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc @@ -480,7 +480,7 @@ std::string GetExitTypePreferenceFromDisk(Profile* profile) { if (!base::ReadFileToString(prefs_path, &prefs)) return std::string(); - scoped_ptr<base::Value> value(base::JSONReader::Read(prefs)); + scoped_ptr<base::Value> value = base::JSONReader::Read(prefs); if (!value) return std::string(); diff --git a/chrome/browser/safe_json_parser_browsertest.cc b/chrome/browser/safe_json_parser_browsertest.cc index f67e513..b6c45377 100644 --- a/chrome/browser/safe_json_parser_browsertest.cc +++ b/chrome/browser/safe_json_parser_browsertest.cc @@ -35,8 +35,8 @@ class SafeJsonParserTest : public InProcessBrowserTest { message_loop_runner_ = new content::MessageLoopRunner; std::string error; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( - json, base::JSON_PARSE_RFC, nullptr, &error)); + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( + json, base::JSON_PARSE_RFC, nullptr, &error); SafeJsonParser::SuccessCallback success_callback; SafeJsonParser::ErrorCallback error_callback; diff --git a/chrome/browser/spellchecker/feedback_sender_unittest.cc b/chrome/browser/spellchecker/feedback_sender_unittest.cc index 93949fb..e0d780d 100644 --- a/chrome/browser/spellchecker/feedback_sender_unittest.cc +++ b/chrome/browser/spellchecker/feedback_sender_unittest.cc @@ -416,8 +416,8 @@ TEST_F(FeedbackSenderTest, FeedbackAPI) { feedback_->OnReceiveDocumentMarkers(kRendererProcessId, std::vector<uint32>()); std::string actual_data = GetUploadData(); - scoped_ptr<base::DictionaryValue> actual( - static_cast<base::DictionaryValue*>(base::JSONReader::Read(actual_data))); + scoped_ptr<base::DictionaryValue> actual(static_cast<base::DictionaryValue*>( + base::JSONReader::DeprecatedRead(actual_data))); actual->SetString("params.key", "TestDummyKey"); base::ListValue* suggestions = NULL; actual->GetList("params.suggestionInfo", &suggestions); @@ -443,7 +443,7 @@ TEST_F(FeedbackSenderTest, FeedbackAPI) { "\"suggestions\":[\"Hello\"]," "\"timestamp\":\"9001\"," "\"userActions\":[{\"actionType\":\"NO_ACTION\"}]}]}}"; - scoped_ptr<base::Value> expected(base::JSONReader::Read(expected_data)); + scoped_ptr<base::Value> expected = base::JSONReader::Read(expected_data); EXPECT_TRUE(expected->Equals(actual.get())) << "Expected data: " << expected_data << "\nActual data: " << actual_data; diff --git a/chrome/browser/spellchecker/misspelling_unittest.cc b/chrome/browser/spellchecker/misspelling_unittest.cc index bfc1628..e3d145a 100644 --- a/chrome/browser/spellchecker/misspelling_unittest.cc +++ b/chrome/browser/spellchecker/misspelling_unittest.cc @@ -20,7 +20,7 @@ TEST(MisspellingTest, SerializeTest) { misspelling.hash = 9001; misspelling.suggestions.push_back(base::ASCIIToUTF16("does it")); - scoped_ptr<base::Value> expected(base::JSONReader::Read( + scoped_ptr<base::Value> expected(base::JSONReader::DeprecatedRead( "{\"originalText\": \"How doe sit know\"," "\"misspelledStart\": 4," "\"misspelledLength\": 7," diff --git a/chrome/browser/spellchecker/spellcheck_action_unittest.cc b/chrome/browser/spellchecker/spellcheck_action_unittest.cc index ce3a86d..a497642 100644 --- a/chrome/browser/spellchecker/spellcheck_action_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_action_unittest.cc @@ -89,7 +89,7 @@ TEST(SpellcheckActionTest, SerializeTest) { scoped_ptr<base::DictionaryValue> serialized( kTestCases[i].action.Serialize()); scoped_ptr<base::Value> expected( - base::JSONReader::Read(kTestCases[i].expected)); + base::JSONReader::DeprecatedRead(kTestCases[i].expected)); EXPECT_TRUE(serialized->Equals(expected.get())); } } diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc index 7248f8a..a0c1381 100644 --- a/chrome/browser/spellchecker/spelling_service_client.cc +++ b/chrome/browser/spellchecker/spelling_service_client.cc @@ -176,8 +176,8 @@ bool SpellingServiceClient::ParseResponse( // } // } scoped_ptr<base::DictionaryValue> value( - static_cast<base::DictionaryValue*>( - base::JSONReader::Read(data, base::JSON_ALLOW_TRAILING_COMMAS))); + static_cast<base::DictionaryValue*>(base::JSONReader::DeprecatedRead( + data, base::JSON_ALLOW_TRAILING_COMMAS))); if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY)) return false; diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index 6c0d617..e1f805f 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -54,9 +54,9 @@ class TestSpellingURLFetcher : public net::TestURLFetcher { EXPECT_EQ("application/json", upload_content_type); // Parse the JSON to be sent to the service, and verify its parameters. - scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( - base::JSONReader::Read(upload_content, - base::JSON_ALLOW_TRAILING_COMMAS))); + scoped_ptr<base::DictionaryValue> value( + static_cast<base::DictionaryValue*>(base::JSONReader::DeprecatedRead( + upload_content, base::JSON_ALLOW_TRAILING_COMMAS))); ASSERT_TRUE(value.get()); std::string method; EXPECT_TRUE(value->GetString("method", &method)); diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc index c1b9921..09097eb 100644 --- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc +++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc @@ -269,7 +269,7 @@ void FamilyInfoFetcher::ParseProfile(const base::DictionaryValue* dict, } void FamilyInfoFetcher::FamilyProfileFetched(const std::string& response) { - scoped_ptr<base::Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response); const base::DictionaryValue* dict = NULL; if (!value || !value->GetAsDictionary(&dict)) { consumer_->OnFailure(SERVICE_ERROR); @@ -299,7 +299,7 @@ void FamilyInfoFetcher::FamilyProfileFetched(const std::string& response) { } void FamilyInfoFetcher::FamilyMembersFetched(const std::string& response) { - scoped_ptr<base::Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response); const base::DictionaryValue* dict = NULL; if (!value || !value->GetAsDictionary(&dict)) { consumer_->OnFailure(SERVICE_ERROR); diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc index e14bbff..d7b5561 100644 --- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc +++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc @@ -248,7 +248,7 @@ void PermissionRequestCreatorApiary::OnURLFetchComplete( std::string response_body; source->GetResponseAsString(&response_body); - scoped_ptr<base::Value> value(base::JSONReader::Read(response_body)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response_body); base::DictionaryValue* dict = NULL; if (!value || !value->GetAsDictionary(&dict)) { DispatchNetworkError(it, net::ERR_INVALID_RESPONSE); diff --git a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc index 8a0e73f..04b2a8e 100644 --- a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc +++ b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc @@ -98,7 +98,7 @@ scoped_ptr<net::URLFetcher> CreateFetcher( // Checks whether the search |response| (in JSON format) contains an entry for // the given |url|. bool ResponseContainsURL(const std::string& response, const GURL& url) { - scoped_ptr<base::Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response); const base::DictionaryValue* dict = NULL; if (!value || !value->GetAsDictionary(&dict)) { DLOG(WARNING) << "ResponseContainsURL failed to parse global dictionary"; diff --git a/chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fetcher.cc b/chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fetcher.cc index 07a3bf8..ed4e0f4 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fetcher.cc +++ b/chrome/browser/supervised_user/legacy/supervised_user_refresh_token_fetcher.cc @@ -219,7 +219,7 @@ void SupervisedUserRefreshTokenFetcherImpl::OnURLFetchComplete( std::string response_body; source->GetResponseAsString(&response_body); - scoped_ptr<base::Value> value(base::JSONReader::Read(response_body)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response_body); base::DictionaryValue* dict = NULL; if (!value.get() || !value->GetAsDictionary(&dict)) { DispatchNetworkError(net::ERR_INVALID_RESPONSE); diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc index 17fc6758..59505a5 100644 --- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc +++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc @@ -208,8 +208,8 @@ SupervisedUserSharedSettingsService::MergeDataAndStartSyncing( const ::sync_pb::ManagedUserSharedSettingSpecifics& supervised_user_shared_setting = sync_data.GetSpecifics().managed_user_shared_setting(); - scoped_ptr<Value> value( - base::JSONReader::Read(supervised_user_shared_setting.value())); + scoped_ptr<Value> value(base::JSONReader::DeprecatedRead( + supervised_user_shared_setting.value())); const std::string& su_id = supervised_user_shared_setting.mu_id(); ScopedSupervisedUserSharedSettingsUpdate update(prefs_, su_id); const std::string& key = supervised_user_shared_setting.key(); @@ -318,8 +318,8 @@ syncer::SyncError SupervisedUserSharedSettingsService::ProcessSyncChanges( dict = new DictionaryValue; update_dict->SetWithoutPathExpansion(key, dict); } - scoped_ptr<Value> value( - base::JSONReader::Read(supervised_user_shared_setting.value())); + scoped_ptr<Value> value(base::JSONReader::DeprecatedRead( + supervised_user_shared_setting.value())); dict->SetWithoutPathExpansion(kValue, value.release()); dict->SetBooleanWithoutPathExpansion( kAcknowledged, supervised_user_shared_setting.acknowledged()); diff --git a/chrome/browser/supervised_user/supervised_user_bookmarks_handler_unittest.cc b/chrome/browser/supervised_user/supervised_user_bookmarks_handler_unittest.cc index 0f1b639..d259cf7 100644 --- a/chrome/browser/supervised_user/supervised_user_bookmarks_handler_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_bookmarks_handler_unittest.cc @@ -152,7 +152,7 @@ const char BOOKMARKS_TREE_INVALID_PARENTS_JSON[] = // Builds the base::Values tree from a json string above. scoped_ptr<base::ListValue> CreateTree(const char* json) { - base::Value* value = base::JSONReader::Read(json); + base::Value* value = base::JSONReader::DeprecatedRead(json); EXPECT_NE(value, nullptr); base::ListValue* list; EXPECT_TRUE(value->GetAsList(&list)); diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc index 41b4aa2..dc47d60 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc @@ -190,7 +190,7 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing( const ::sync_pb::ManagedUserSettingSpecifics& supervised_user_setting = sync_data.GetSpecifics().managed_user_setting(); scoped_ptr<base::Value> value( - JSONReader::Read(supervised_user_setting.value())); + JSONReader::DeprecatedRead(supervised_user_setting.value())); std::string name_suffix = supervised_user_setting.name(); base::DictionaryValue* dict = GetDictionaryAndSplitKey(&name_suffix); dict->SetWithoutPathExpansion(name_suffix, value.release()); @@ -274,7 +274,7 @@ SyncError SupervisedUserSettingsService::ProcessSyncChanges( case SyncChange::ACTION_ADD: case SyncChange::ACTION_UPDATE: { scoped_ptr<base::Value> value( - JSONReader::Read(supervised_user_setting.value())); + JSONReader::DeprecatedRead(supervised_user_setting.value())); if (dict->HasKey(key)) { DLOG_IF(WARNING, change_type == SyncChange::ACTION_ADD) << "Value for key " << key << " already exists"; diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc index 40a738a..b13fa00 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc @@ -108,7 +108,7 @@ class SupervisedUserSettingsServiceTest : public ::testing::Test { } scoped_ptr<base::Value> value( - base::JSONReader::Read(supervised_user_setting.value())); + base::JSONReader::DeprecatedRead(supervised_user_setting.value())); EXPECT_TRUE(expected_value->Equals(value.get())); } diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 67af484..404dbda 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -94,7 +94,7 @@ class BrowserThemePackTest : public ::testing::Test { } void LoadColorJSON(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); LoadColorDictionary(static_cast<base::DictionaryValue*>(value.get())); } @@ -104,7 +104,7 @@ class BrowserThemePackTest : public ::testing::Test { } void LoadTintJSON(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); LoadTintDictionary(static_cast<base::DictionaryValue*>(value.get())); } @@ -114,7 +114,7 @@ class BrowserThemePackTest : public ::testing::Test { } void LoadDisplayPropertiesJSON(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); LoadDisplayPropertiesDictionary( static_cast<base::DictionaryValue*>(value.get())); @@ -126,7 +126,7 @@ class BrowserThemePackTest : public ::testing::Test { void ParseImageNamesJSON(const std::string& json, TestFilePathMap* out_file_paths) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); ParseImageNamesDictionary(static_cast<base::DictionaryValue*>(value.get()), out_file_paths); diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm index 5b3644f..6ff3b95 100644 --- a/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm +++ b/chrome/browser/ui/cocoa/applescript/apple_event_util_unittest.mm @@ -89,7 +89,7 @@ TEST_F(AppleEventUtilTest, DISABLED_ValueToAppleEventDescriptor) { }; for (size_t i = 0; i < arraysize(cases); ++i) { - scoped_ptr<base::Value> value(base::JSONReader::Read(cases[i].json_input)); + scoped_ptr<base::Value> value = base::JSONReader::Read(cases[i].json_input); NSAppleEventDescriptor* descriptor = chrome::mac::ValueToAppleEventDescriptor(value.get()); NSString* descriptor_description = [descriptor description]; diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 10ebefc..d227cf5 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -25,7 +25,7 @@ namespace { // corresponding dictionary in |left_list|. Ignores keys in dictionaries in // |left_list| that are not in the corresponding dictionary in |right_list|. bool ListMatches(base::ListValue* left_list, const std::string& right_json) { - scoped_ptr<base::Value> right_value(base::JSONReader::Read(right_json)); + scoped_ptr<base::Value> right_value = base::JSONReader::Read(right_json); base::ListValue* right_list = NULL; CHECK(right_value->GetAsList(&right_list)); for (size_t i = 0; i < left_list->GetSize(); ++i) { diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index f1ca93a..c96baaa 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -587,8 +587,7 @@ void CoreOptionsHandler::HandleSetPref(const base::ListValue* args, NOTREACHED(); return; } - temp_value.reset( - base::JSONReader::Read(json_string)); + temp_value.reset(base::JSONReader::DeprecatedRead(json_string)); value = temp_value.get(); if (!value->IsType(base::Value::TYPE_LIST)) { NOTREACHED(); diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index 99805dc..b5a89c9 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -261,7 +261,7 @@ void PreferencesBrowserTest::VerifyObservedPref(const std::string& json, const std::string& controlledBy, bool disabled, bool uncommitted) { - scoped_ptr<base::Value> observed_value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> observed_value_ptr = base::JSONReader::Read(json); const base::DictionaryValue* observed_dict; ASSERT_TRUE(observed_value_ptr.get()); ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict)); @@ -275,7 +275,7 @@ void PreferencesBrowserTest::VerifyObservedPrefs( const std::string& controlledBy, bool disabled, bool uncommitted) { - scoped_ptr<base::Value> observed_value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> observed_value_ptr = base::JSONReader::Read(json); const base::DictionaryValue* observed_dict; ASSERT_TRUE(observed_value_ptr.get()); ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict)); diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc index bc9e41f..48e10b0 100644 --- a/chrome/browser/ui/webui/options/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc @@ -89,7 +89,7 @@ SyncConfigInfo::SyncConfigInfo() SyncConfigInfo::~SyncConfigInfo() {} bool GetConfiguration(const std::string& json, SyncConfigInfo* config) { - scoped_ptr<base::Value> parsed_value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> parsed_value = base::JSONReader::Read(json); base::DictionaryValue* result; if (!parsed_value || !parsed_value->GetAsDictionary(&result)) { DLOG(ERROR) << "GetConfiguration() not passed a Dictionary"; diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index bb0b94d..161a734 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc @@ -153,7 +153,7 @@ void PolicyUITest::VerifyPolicies( std::string json; ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents, javascript, &json)); - scoped_ptr<base::Value> value_ptr(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value_ptr = base::JSONReader::Read(json); const base::ListValue* actual_policies = NULL; ASSERT_TRUE(value_ptr.get()); ASSERT_TRUE(value_ptr->GetAsList(&actual_policies)); diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 237bba9..0567ac7 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -187,7 +187,7 @@ base::DictionaryValue* GetSettingsDictionary(const base::ListValue* args) { } scoped_ptr<base::DictionaryValue> settings( static_cast<base::DictionaryValue*>( - base::JSONReader::Read(json_str))); + base::JSONReader::DeprecatedRead(json_str))); if (!settings.get() || !settings->IsType(base::Value::TYPE_DICTIONARY)) { NOTREACHED() << "Print job settings must be a dictionary."; return NULL; diff --git a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc index 0a187c2..dc358a4 100644 --- a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc @@ -45,7 +45,7 @@ class NotificationPromoMobileNtpTest { const std::string& promo_action_type, const std::string& promo_action_arg0, const std::string& promo_action_arg1) { - base::Value* value(base::JSONReader::Read(json)); + base::Value* value(base::JSONReader::DeprecatedRead(json)); ASSERT_TRUE(value); base::DictionaryValue* dict = NULL; value->GetAsDictionary(&dict); diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 90168ca9..6fd084f 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -94,7 +94,7 @@ class NotificationPromoTest { std::string json_with_end_date( ReplaceStringPlaceholders(json, replacements, NULL)); - base::Value* value(base::JSONReader::Read(json_with_end_date)); + base::Value* value(base::JSONReader::DeprecatedRead(json_with_end_date)); ASSERT_TRUE(value); base::DictionaryValue* dict = NULL; diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index 04e4beb..aed0671 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -170,7 +170,7 @@ TEST(ExtensionAPITest, APIFeatures) { api_features_path, &api_features_str)) << "api_features.json"; scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( - base::JSONReader::Read(api_features_str))); + base::JSONReader::DeprecatedRead(api_features_str))); BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); for (size_t i = 0; i < arraysize(test_data); ++i) { @@ -250,7 +250,7 @@ TEST(ExtensionAPITest, IsAnyFeatureAvailableToContext) { api_features_path, &api_features_str)) << "api_features.json"; scoped_ptr<base::DictionaryValue> value(static_cast<base::DictionaryValue*>( - base::JSONReader::Read(api_features_str))); + base::JSONReader::DeprecatedRead(api_features_str))); BaseFeatureProvider api_feature_provider(*value, CreateAPIFeature); for (size_t i = 0; i < arraysize(test_data); ++i) { diff --git a/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc b/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc index 6026a64..134242e 100644 --- a/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc @@ -55,7 +55,7 @@ class PrinterJobQueueHandlerTest : public ::testing::Test { base::DictionaryValue* json_data_; void SetUp() override { base::JSONReader json_reader; - data_ = json_reader.Read(kJobListResponse); + data_ = json_reader.DeprecatedRead(kJobListResponse); data_->GetAsDictionary(&json_data_); } diff --git a/chrome/test/base/extension_js_browser_test.cc b/chrome/test/base/extension_js_browser_test.cc index 70ddca1..b84d223 100644 --- a/chrome/test/base/extension_js_browser_test.cc +++ b/chrome/test/base/extension_js_browser_test.cc @@ -51,9 +51,7 @@ bool ExtensionJSBrowserTest::RunJavascriptTestF(bool is_async, load_waiter_->extension_id(), script); - base::JSONReader reader; - scoped_ptr<base::Value> value_result; - value_result.reset(reader.Read(result)); + scoped_ptr<base::Value> value_result = base::JSONReader::Read(result); CHECK_EQ(base::Value::TYPE_DICTIONARY, value_result->GetType()); base::DictionaryValue* dict_value = static_cast<base::DictionaryValue*>(value_result.get()); diff --git a/chrome/test/chromedriver/chrome/browser_info.cc b/chrome/test/chromedriver/chrome/browser_info.cc index bd7f309..a5711e6 100644 --- a/chrome/test/chromedriver/chrome/browser_info.cc +++ b/chrome/test/chromedriver/chrome/browser_info.cc @@ -29,7 +29,7 @@ BrowserInfo::BrowserInfo(std::string browser_name, } Status ParseBrowserInfo(const std::string& data, BrowserInfo* browser_info) { - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value.get()) return Status(kUnknownError, "version info not in JSON"); diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl.cc b/chrome/test/chromedriver/chrome/devtools_client_impl.cc index 56da77b..cd5c7f8 100644 --- a/chrome/test/chromedriver/chrome/devtools_client_impl.cc +++ b/chrome/test/chromedriver/chrome/devtools_client_impl.cc @@ -23,7 +23,7 @@ const char kInspectorContextError[] = "Execution context with given id not found."; Status ParseInspectorError(const std::string& error_json) { - scoped_ptr<base::Value> error(base::JSONReader::Read(error_json)); + scoped_ptr<base::Value> error = base::JSONReader::Read(error_json); base::DictionaryValue* error_dict; if (!error || !error->GetAsDictionary(&error_dict)) return Status(kUnknownError, "inspector error with no error message"); @@ -463,7 +463,7 @@ bool ParseInspectorMessage( InspectorMessageType* type, InspectorEvent* event, InspectorCommandResponse* command_response) { - scoped_ptr<base::Value> message_value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(message); base::DictionaryValue* message_dict; if (!message_value || !message_value->GetAsDictionary(&message_dict)) return false; diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc index 4a0a4b0..4c9656d 100644 --- a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc @@ -41,7 +41,7 @@ class MockSyncWebSocket : public SyncWebSocket { bool Send(const std::string& message) override { EXPECT_TRUE(connected_); - scoped_ptr<base::Value> value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> value = base::JSONReader::Read(message); base::DictionaryValue* dict = NULL; EXPECT_TRUE(value->GetAsDictionary(&dict)); if (!dict) @@ -711,7 +711,7 @@ class OnConnectedSyncWebSocket : public SyncWebSocket { bool Send(const std::string& message) override { EXPECT_TRUE(connected_); - scoped_ptr<base::Value> value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> value = base::JSONReader::Read(message); base::DictionaryValue* dict = NULL; EXPECT_TRUE(value->GetAsDictionary(&dict)); if (!dict) diff --git a/chrome/test/chromedriver/chrome/devtools_http_client.cc b/chrome/test/chromedriver/chrome/devtools_http_client.cc index b49c3a3..7085180 100644 --- a/chrome/test/chromedriver/chrome/devtools_http_client.cc +++ b/chrome/test/chromedriver/chrome/devtools_http_client.cc @@ -232,7 +232,7 @@ bool DevToolsHttpClient::FetchUrlAndLog(const std::string& url, namespace internal { Status ParseWebViewsInfo(const std::string& data, WebViewsInfo* views_info) { - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value.get()) return Status(kUnknownError, "DevTools returned invalid JSON"); base::ListValue* list; diff --git a/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc index 2deeb09..4ba6dea 100644 --- a/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc +++ b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc @@ -60,7 +60,7 @@ TEST(DomTracker, GetFrameIdForNode) { " {\"nodeId\":102,\"frameId\":\"f\"}]" "}]"; base::DictionaryValue params; - params.Set("nodes", base::JSONReader::Read(nodes)); + params.Set("nodes", base::JSONReader::DeprecatedRead(nodes)); ASSERT_EQ(kOk, tracker.OnEvent(&client, "DOM.setChildNodes", params).code()); ASSERT_TRUE(tracker.GetFrameIdForNode(101, &frame_id).IsError()); ASSERT_TRUE(frame_id.empty()); @@ -79,15 +79,15 @@ TEST(DomTracker, ChildNodeInserted) { std::string frame_id; base::DictionaryValue params; - params.Set("node", base::JSONReader::Read("{\"nodeId\":1}")); + params.Set("node", base::JSONReader::DeprecatedRead("{\"nodeId\":1}")); ASSERT_EQ(kOk, tracker.OnEvent(&client, "DOM.childNodeInserted", params).code()); ASSERT_TRUE(tracker.GetFrameIdForNode(1, &frame_id).IsError()); ASSERT_TRUE(frame_id.empty()); params.Clear(); - params.Set("node", base::JSONReader::Read( - "{\"nodeId\":2,\"frameId\":\"f\"}")); + params.Set("node", base::JSONReader::DeprecatedRead( + "{\"nodeId\":2,\"frameId\":\"f\"}")); ASSERT_EQ(kOk, tracker.OnEvent(&client, "DOM.childNodeInserted", params).code()); ASSERT_TRUE(tracker.GetFrameIdForNode(2, &frame_id).IsOk()); diff --git a/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc b/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc index f79dcc4..340a5a0 100644 --- a/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc +++ b/chrome/test/chromedriver/chrome/frame_tracker_unittest.cc @@ -20,7 +20,7 @@ TEST(FrameTracker, GetContextIdForFrame) { const char context[] = "{\"id\":100,\"frameId\":\"f\"}"; base::DictionaryValue params; - params.Set("context", base::JSONReader::Read(context)); + params.Set("context", base::JSONReader::DeprecatedRead(context)); ASSERT_EQ(kOk, tracker.OnEvent(&client, "Runtime.executionContextCreated", params) .code()); @@ -48,7 +48,7 @@ TEST(FrameTracker, CanUpdateFrameContextId) { const char context[] = "{\"id\":1,\"frameId\":\"f\"}"; base::DictionaryValue params; - params.Set("context", base::JSONReader::Read(context)); + params.Set("context", base::JSONReader::DeprecatedRead(context)); ASSERT_EQ(kOk, tracker.OnEvent(&client, "Runtime.executionContextCreated", params) .code()); diff --git a/chrome/test/chromedriver/chrome/heap_snapshot_taker.cc b/chrome/test/chromedriver/chrome/heap_snapshot_taker.cc index 0f119e0..6e0caa0 100644 --- a/chrome/test/chromedriver/chrome/heap_snapshot_taker.cc +++ b/chrome/test/chromedriver/chrome/heap_snapshot_taker.cc @@ -24,7 +24,7 @@ Status HeapSnapshotTaker::TakeSnapshot(scoped_ptr<base::Value>* snapshot) { Status status3(kOk); if (status1.IsOk() && status2.IsOk()) { - scoped_ptr<base::Value> value(base::JSONReader::Read(snapshot_)); + scoped_ptr<base::Value> value = base::JSONReader::Read(snapshot_); if (!value) { status3 = Status(kUnknownError, "heap snapshot not in JSON format"); } else { diff --git a/chrome/test/chromedriver/chrome/log.cc b/chrome/test/chromedriver/chrome/log.cc index ed1190a..4b5796c 100644 --- a/chrome/test/chromedriver/chrome/log.cc +++ b/chrome/test/chromedriver/chrome/log.cc @@ -101,7 +101,7 @@ std::string FormatValueForDisplay(const base::Value& value) { } std::string FormatJsonForDisplay(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); if (!value) value.reset(new base::StringValue(json)); return FormatValueForDisplay(*value); diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc index 6326e14d..85e51d2 100644 --- a/chrome/test/chromedriver/chrome_launcher.cc +++ b/chrome/test/chromedriver/chrome_launcher.cc @@ -664,7 +664,8 @@ Status ProcessExtension(const std::string& extension, std::string manifest_data; if (!base::ReadFileToString(manifest_path, &manifest_data)) return Status(kUnknownError, "cannot read manifest"); - scoped_ptr<base::Value> manifest_value(base::JSONReader::Read(manifest_data)); + scoped_ptr<base::Value> manifest_value = + base::JSONReader::Read(manifest_data); base::DictionaryValue* manifest; if (!manifest_value || !manifest_value->GetAsDictionary(&manifest)) return Status(kUnknownError, "invalid manifest"); @@ -772,8 +773,9 @@ Status WritePrefsFile( const base::FilePath& path) { int code; std::string error_msg; - scoped_ptr<base::Value> template_value(base::JSONReader::ReadAndReturnError( - template_string, 0, &code, &error_msg)); + scoped_ptr<base::Value> template_value( + base::JSONReader::DeprecatedReadAndReturnError(template_string, 0, &code, + &error_msg)); base::DictionaryValue* prefs; if (!template_value || !template_value->GetAsDictionary(&prefs)) { return Status(kUnknownError, diff --git a/chrome/test/chromedriver/chrome_launcher_unittest.cc b/chrome/test/chromedriver/chrome_launcher_unittest.cc index 3abf86c..5ccec7c 100644 --- a/chrome/test/chromedriver/chrome_launcher_unittest.cc +++ b/chrome/test/chromedriver/chrome_launcher_unittest.cc @@ -89,7 +89,7 @@ TEST(ProcessExtensions, SingleExtensionWithBgPage) { std::string manifest_txt; ASSERT_TRUE(base::ReadFileToString( temp_ext_path.AppendASCII("manifest.json"), &manifest_txt)); - scoped_ptr<base::Value> manifest(base::JSONReader::Read(manifest_txt)); + scoped_ptr<base::Value> manifest = base::JSONReader::Read(manifest_txt); ASSERT_TRUE(manifest); base::DictionaryValue* manifest_dict = NULL; ASSERT_TRUE(manifest->GetAsDictionary(&manifest_dict)); @@ -180,7 +180,7 @@ TEST(PrepareUserDataDir, CustomPrefs) { chrome::kPreferencesFilename); std::string prefs_str; ASSERT_TRUE(base::ReadFileToString(prefs_file, &prefs_str)); - scoped_ptr<base::Value> prefs_value(base::JSONReader::Read(prefs_str)); + scoped_ptr<base::Value> prefs_value = base::JSONReader::Read(prefs_str); const base::DictionaryValue* prefs_dict = NULL; ASSERT_TRUE(prefs_value->GetAsDictionary(&prefs_dict)); AssertEQ(*prefs_dict, "myPrefsKey", "ok"); @@ -191,7 +191,7 @@ TEST(PrepareUserDataDir, CustomPrefs) { std::string local_state_str; ASSERT_TRUE(base::ReadFileToString(local_state_file, &local_state_str)); scoped_ptr<base::Value> local_state_value( - base::JSONReader::Read(local_state_str)); + base::JSONReader::DeprecatedRead(local_state_str)); const base::DictionaryValue* local_state_dict = NULL; ASSERT_TRUE(local_state_value->GetAsDictionary(&local_state_dict)); AssertEQ(*local_state_dict, "myLocalKey", "ok"); diff --git a/chrome/test/chromedriver/performance_logger_unittest.cc b/chrome/test/chromedriver/performance_logger_unittest.cc index bf69638..71ea3cf 100644 --- a/chrome/test/chromedriver/performance_logger_unittest.cc +++ b/chrome/test/chromedriver/performance_logger_unittest.cc @@ -118,7 +118,7 @@ void FakeLog::AddEntryTimestamped(const base::Time& timestamp, scoped_ptr<base::DictionaryValue> ParseDictionary(const std::string& json) { std::string error; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedReadAndReturnError( json, base::JSON_PARSE_RFC, NULL, &error)); if (value == NULL) { SCOPED_TRACE(json.c_str()); diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc index 157b94a..78b2cc0a 100644 --- a/chrome/test/chromedriver/server/http_handler.cc +++ b/chrome/test/chromedriver/server/http_handler.cc @@ -643,7 +643,7 @@ void HttpHandler::HandleCommand( if (request.data.length()) { base::DictionaryValue* body_params; - scoped_ptr<base::Value> parsed_body(base::JSONReader::Read(request.data)); + scoped_ptr<base::Value> parsed_body = base::JSONReader::Read(request.data); if (!parsed_body || !parsed_body->GetAsDictionary(&body_params)) { scoped_ptr<net::HttpServerResponseInfo> response( new net::HttpServerResponseInfo(net::HTTP_BAD_REQUEST)); diff --git a/chrome/test/remoting/qunit_browser_test_runner.cc b/chrome/test/remoting/qunit_browser_test_runner.cc index e476f77..4fe7523 100644 --- a/chrome/test/remoting/qunit_browser_test_runner.cc +++ b/chrome/test/remoting/qunit_browser_test_runner.cc @@ -22,9 +22,8 @@ void QUnitBrowserTestRunner::QUnitStart(content::WebContents* web_contents) { web_contents, "browserTestHarness.run();", &result)); // Read in the JSON. - base::JSONReader reader; - scoped_ptr<base::Value> value; - value.reset(reader.Read(result, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> value = base::JSONReader::Read( + result, base::JSON_ALLOW_TRAILING_COMMAS); // Convert to dictionary. base::DictionaryValue* dict_value = NULL; diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc index efa337e..a90371a 100644 --- a/chrome/test/remoting/remote_desktop_browsertest.cc +++ b/chrome/test/remoting/remote_desktop_browsertest.cc @@ -736,8 +736,8 @@ void RemoteDesktopBrowserTest::RunJavaScriptTest( // Read in the JSON base::JSONReader reader; - scoped_ptr<base::Value> value; - value.reset(reader.Read(result, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> value = + reader.Read(result, base::JSON_ALLOW_TRAILING_COMMAS); // Convert to dictionary base::DictionaryValue* dict_value = NULL; @@ -865,8 +865,8 @@ void RemoteDesktopBrowserTest::SetUserNameAndPassword( ASSERT_TRUE(base::ReadFileToString(absolute_path, &accounts_info)); // Get the root dictionary from the input json file contents. - scoped_ptr<base::Value> root( - base::JSONReader::Read(accounts_info, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> root(base::JSONReader::DeprecatedRead( + accounts_info, base::JSON_ALLOW_TRAILING_COMMAS)); const base::DictionaryValue* root_dict = NULL; ASSERT_TRUE(root.get() && root->GetAsDictionary(&root_dict)); diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index ba8b9f9..6b92765 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -372,11 +372,11 @@ void ChromeContentUtilityClient::OnRobustJPEGDecodeImage( void ChromeContentUtilityClient::OnParseJSON(const std::string& json) { int error_code; std::string error; - base::Value* value = base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( json, base::JSON_PARSE_RFC, &error_code, &error); if (value) { base::ListValue wrapper; - wrapper.Append(value); + wrapper.Append(value.Pass()); Send(new ChromeUtilityHostMsg_ParseJSON_Succeeded(wrapper)); } else { Send(new ChromeUtilityHostMsg_ParseJSON_Failed(error)); diff --git a/chromeos/geolocation/simple_geolocation_request.cc b/chromeos/geolocation/simple_geolocation_request.cc index ee7692f..90cfad3 100644 --- a/chromeos/geolocation/simple_geolocation_request.cc +++ b/chromeos/geolocation/simple_geolocation_request.cc @@ -165,8 +165,9 @@ bool ParseServerResponse(const GURL& server_url, // Parse the response, ignoring comments. std::string error_msg; - scoped_ptr<base::Value> response_value(base::JSONReader::ReadAndReturnError( - response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); + scoped_ptr<base::Value> response_value( + base::JSONReader::DeprecatedReadAndReturnError( + response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); if (response_value == NULL) { PrintGeolocationError( server_url, "JSONReader failed: " + error_msg, position); diff --git a/chromeos/network/auto_connect_handler_unittest.cc b/chromeos/network/auto_connect_handler_unittest.cc index c3f7c2d..a52f60e 100644 --- a/chromeos/network/auto_connect_handler_unittest.cc +++ b/chromeos/network/auto_connect_handler_unittest.cc @@ -214,9 +214,10 @@ class AutoConnectHandlerTest : public testing::Test { scoped_ptr<base::ListValue> network_configs(new base::ListValue); if (!network_configs_json.empty()) { std::string error; - base::Value* network_configs_value = base::JSONReader::ReadAndReturnError( - network_configs_json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, - &error); + base::Value* network_configs_value = + base::JSONReader::DeprecatedReadAndReturnError( + network_configs_json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, + &error); ASSERT_TRUE(network_configs_value) << error; base::ListValue* network_configs_list = nullptr; ASSERT_TRUE(network_configs_value->GetAsList(&network_configs_list)); diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc index 0604972..fb04d94 100644 --- a/chromeos/network/client_cert_resolver_unittest.cc +++ b/chromeos/network/client_cert_resolver_unittest.cc @@ -198,8 +198,9 @@ class ClientCertResolverTest : public testing::Test, base::StringPrintf(kTestPolicyTemplate, test_ca_cert_pem_.c_str()); std::string error; - scoped_ptr<base::Value> policy_value(base::JSONReader::ReadAndReturnError( - policy_json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error)); + scoped_ptr<base::Value> policy_value( + base::JSONReader::DeprecatedReadAndReturnError( + policy_json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error)); ASSERT_TRUE(policy_value) << error; base::ListValue* policy = NULL; diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc index 9efff32..c36cb1e 100644 --- a/chromeos/network/network_connection_handler_unittest.cc +++ b/chromeos/network/network_connection_handler_unittest.cc @@ -275,9 +275,9 @@ class NetworkConnectionHandlerTest : public testing::Test { bool user_policy) { std::string error; scoped_ptr<base::Value> network_configs_value( - base::JSONReader::ReadAndReturnError(network_configs_json, - base::JSON_ALLOW_TRAILING_COMMAS, - nullptr, &error)); + base::JSONReader::DeprecatedReadAndReturnError( + network_configs_json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, + &error)); ASSERT_TRUE(network_configs_value) << error; base::ListValue* network_configs = nullptr; diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc index aca9133..aca2df0 100644 --- a/chromeos/network/onc/onc_translator_shill_to_onc.cc +++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc @@ -34,7 +34,7 @@ scoped_ptr<base::Value> ConvertStringToValue(const std::string& str, if (type == base::Value::TYPE_STRING) { value = new base::StringValue(str); } else { - value = base::JSONReader::Read(str); + value = base::JSONReader::DeprecatedRead(str); } if (value == NULL || value->GetType() != type) { diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc index 8749d5a..2123272 100644 --- a/chromeos/network/onc/onc_utils.cc +++ b/chromeos/network/onc/onc_utils.cc @@ -42,7 +42,7 @@ const char kEmptyUnencryptedConfiguration[] = scoped_ptr<base::DictionaryValue> ReadDictionaryFromJson( const std::string& json) { std::string error; - base::Value* root = base::JSONReader::ReadAndReturnError( + base::Value* root = base::JSONReader::DeprecatedReadAndReturnError( json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error); base::DictionaryValue* dict_ptr = nullptr; diff --git a/chromeos/timezone/timezone_request.cc b/chromeos/timezone/timezone_request.cc index 0a41f9f..de0d7c1 100644 --- a/chromeos/timezone/timezone_request.cc +++ b/chromeos/timezone/timezone_request.cc @@ -175,8 +175,9 @@ bool ParseServerResponse(const GURL& server_url, // Parse the response, ignoring comments. std::string error_msg; - scoped_ptr<base::Value> response_value(base::JSONReader::ReadAndReturnError( - response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); + scoped_ptr<base::Value> response_value( + base::JSONReader::DeprecatedReadAndReturnError( + response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); if (response_value == NULL) { PrintTimeZoneError(server_url, "JSONReader failed: " + error_msg, timezone); RecordUmaEvent(TIMEZONE_REQUEST_EVENT_RESPONSE_MALFORMED); diff --git a/components/autofill/content/browser/wallet/full_wallet_unittest.cc b/components/autofill/content/browser/wallet/full_wallet_unittest.cc index 9662212..1b38c92 100644 --- a/components/autofill/content/browser/wallet/full_wallet_unittest.cc +++ b/components/autofill/content/browser/wallet/full_wallet_unittest.cc @@ -372,7 +372,7 @@ class FullWalletTest : public testing::Test { FullWalletTest() {} protected: void SetUpDictionary(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value.get()); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); dict.reset(static_cast<base::DictionaryValue*>(value.release())); diff --git a/components/autofill/content/browser/wallet/wallet_address_unittest.cc b/components/autofill/content/browser/wallet/wallet_address_unittest.cc index a81b137..a8ed7ac 100644 --- a/components/autofill/content/browser/wallet/wallet_address_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_address_unittest.cc @@ -219,7 +219,7 @@ class WalletAddressTest : public testing::Test { WalletAddressTest() {} protected: void SetUpDictionary(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); DCHECK(value.get()); DCHECK(value->IsType(base::Value::TYPE_DICTIONARY)); dict_.reset(static_cast<base::DictionaryValue*>(value.release())); diff --git a/components/autofill/content/browser/wallet/wallet_client.cc b/components/autofill/content/browser/wallet/wallet_client.cc index e599b2e..1a23ea0 100644 --- a/components/autofill/content/browser/wallet/wallet_client.cc +++ b/components/autofill/content/browser/wallet/wallet_client.cc @@ -580,7 +580,7 @@ void WalletClient::OnURLFetchComplete( // Valid response. case net::HTTP_OK: { - scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); if (message_value.get() && message_value->IsType(base::Value::TYPE_DICTIONARY)) { response_dict.reset( @@ -592,7 +592,7 @@ void WalletClient::OnURLFetchComplete( // Response contains an error to show the user. case net::HTTP_FORBIDDEN: case net::HTTP_INTERNAL_SERVER_ERROR: { - scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); if (message_value.get() && message_value->IsType(base::Value::TYPE_DICTIONARY)) { response_dict.reset( diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc index a57bbf5..ab7af94 100644 --- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc @@ -865,7 +865,7 @@ class WalletClientTest : public testing::Test { private: std::string GetData(const std::string& upload_data) { - scoped_ptr<base::Value> root(base::JSONReader::Read(upload_data)); + scoped_ptr<base::Value> root = base::JSONReader::Read(upload_data); // If this is not a JSON dictionary, return plain text. if (!root || !root->IsType(base::Value::TYPE_DICTIONARY)) diff --git a/components/autofill/content/browser/wallet/wallet_items_unittest.cc b/components/autofill/content/browser/wallet/wallet_items_unittest.cc index 2ebd30d..6b80878 100644 --- a/components/autofill/content/browser/wallet/wallet_items_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_items_unittest.cc @@ -393,7 +393,7 @@ class WalletItemsTest : public testing::Test { WalletItemsTest() {} protected: void SetUpDictionary(const std::string& json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); ASSERT_TRUE(value.get()); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); dict.reset(static_cast<base::DictionaryValue*>(value.release())); diff --git a/components/autofill/core/browser/wallet/real_pan_wallet_client.cc b/components/autofill/core/browser/wallet/real_pan_wallet_client.cc index ec7adb5..578d765 100644 --- a/components/autofill/core/browser/wallet/real_pan_wallet_client.cc +++ b/components/autofill/core/browser/wallet/real_pan_wallet_client.cc @@ -138,7 +138,7 @@ void RealPanWalletClient::OnURLFetchComplete(const net::URLFetcher* source) { // Valid response. case net::HTTP_OK: { std::string error_code; - scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); if (message_value.get() && message_value->IsType(base::Value::TYPE_DICTIONARY)) { response_dict.reset( diff --git a/components/cloud_devices/common/cloud_device_description.cc b/components/cloud_devices/common/cloud_device_description.cc index ba29908..d24ef0c 100644 --- a/components/cloud_devices/common/cloud_device_description.cc +++ b/components/cloud_devices/common/cloud_device_description.cc @@ -36,7 +36,7 @@ bool CloudDeviceDescription::InitFromDictionary( } bool CloudDeviceDescription::InitFromString(const std::string& json) { - scoped_ptr<base::Value> parsed(base::JSONReader::Read(json)); + scoped_ptr<base::Value> parsed = base::JSONReader::Read(json); base::DictionaryValue* description = NULL; if (!parsed || !parsed->GetAsDictionary(&description)) return false; diff --git a/components/cloud_devices/common/printer_description_unittest.cc b/components/cloud_devices/common/printer_description_unittest.cc index 5c8b182..72d0ee4 100644 --- a/components/cloud_devices/common/printer_description_unittest.cc +++ b/components/cloud_devices/common/printer_description_unittest.cc @@ -20,7 +20,7 @@ namespace printer { std::string NormalizeJson(const std::string& json) { std::string result = json; base::ReplaceChars(result, "'", "\"", &result); - scoped_ptr<base::Value> value(base::JSONReader::Read(result)); + scoped_ptr<base::Value> value = base::JSONReader::Read(result); DCHECK(value); base::JSONWriter::Write(*value, &result); return result; diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc index a398a6c..6be1a81 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -305,8 +305,8 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences( continue; } - scoped_ptr<base::Value> value(base::JSONReader::Read(pattern_filter_json, - base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedRead( + pattern_filter_json, base::JSON_ALLOW_TRAILING_COMMAS)); if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:" " Invalid JSON object: " << pattern_filter_json; diff --git a/components/cronet/android/chromium_url_request_context.cc b/components/cronet/android/chromium_url_request_context.cc index 1bfcf2f..b681740 100644 --- a/components/cronet/android/chromium_url_request_context.cc +++ b/components/cronet/android/chromium_url_request_context.cc @@ -70,7 +70,7 @@ static jlong CreateRequestContextAdapter(JNIEnv* env, std::string config = ConvertJavaStringToUTF8(env, jconfig); - scoped_ptr<base::Value> config_value(base::JSONReader::Read(config)); + scoped_ptr<base::Value> config_value = base::JSONReader::Read(config); if (!config_value || !config_value->IsType(base::Value::TYPE_DICTIONARY)) { DLOG(ERROR) << "Bad JSON: " << config; return 0; diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc index b600807..201f9d3 100644 --- a/components/cronet/url_request_context_config.cc +++ b/components/cronet/url_request_context_config.cc @@ -42,7 +42,7 @@ URLRequestContextConfig::~URLRequestContextConfig() { } bool URLRequestContextConfig::LoadFromJSON(const std::string& config_string) { - scoped_ptr<base::Value> config_value(base::JSONReader::Read(config_string)); + scoped_ptr<base::Value> config_value = base::JSONReader::Read(config_string); if (!config_value || !config_value->IsType(base::Value::TYPE_DICTIONARY)) { DLOG(ERROR) << "Bad JSON: " << config_string; return false; diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc index 586ad68..a7fee49 100644 --- a/components/data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc +++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_client_config_parser.cc @@ -95,7 +95,7 @@ base::Time TimestampToTime(const Timestamp& timestamp) { } bool ParseClientConfig(const std::string& config_data, ClientConfig* config) { - scoped_ptr<base::Value> parsed_data(base::JSONReader::Read(config_data)); + scoped_ptr<base::Value> parsed_data = base::JSONReader::Read(config_data); if (!parsed_data) return false; diff --git a/components/dom_distiller/core/page_features.cc b/components/dom_distiller/core/page_features.cc index 0540588..7d3115c 100644 --- a/components/dom_distiller/core/page_features.cc +++ b/components/dom_distiller/core/page_features.cc @@ -142,7 +142,7 @@ std::vector<double> CalculateDerivedFeaturesFromJSON( return std::vector<double>(); } - scoped_ptr<base::Value> json(base::JSONReader::Read(stringified)); + scoped_ptr<base::Value> json = base::JSONReader::Read(stringified); if (!json) { return std::vector<double>(); } diff --git a/components/dom_distiller/core/page_features_unittest.cc b/components/dom_distiller/core/page_features_unittest.cc index 1fee593..3fe594f 100644 --- a/components/dom_distiller/core/page_features_unittest.cc +++ b/components/dom_distiller/core/page_features_unittest.cc @@ -35,11 +35,11 @@ TEST(DomDistillerPageFeaturesTest, TestCalculateDerivedFeatures) { "components/test/data/dom_distiller/derived_features.json"), &expected_output_data)); - scoped_ptr<base::Value> input_json(base::JSONReader::Read(input_data)); + scoped_ptr<base::Value> input_json = base::JSONReader::Read(input_data); ASSERT_TRUE(input_json); scoped_ptr<base::Value> expected_output_json( - base::JSONReader::Read(expected_output_data)); + base::JSONReader::DeprecatedRead(expected_output_data)); ASSERT_TRUE(expected_output_json); base::ListValue* input_entries; diff --git a/components/dom_distiller/ios/distiller_page_ios.mm b/components/dom_distiller/ios/distiller_page_ios.mm index 1935954..c4859af 100644 --- a/components/dom_distiller/ios/distiller_page_ios.mm +++ b/components/dom_distiller/ios/distiller_page_ios.mm @@ -112,7 +112,7 @@ void DistillerPageIOS::HandleJavaScriptResultString(NSString* result) { scoped_ptr<base::Value> resultValue = base::Value::CreateNullValue(); if (result.length) { scoped_ptr<base::Value> dictionaryValue( - base::JSONReader::Read(base::SysNSStringToUTF8(result))); + base::JSONReader::DeprecatedRead(base::SysNSStringToUTF8(result))); if (dictionaryValue && dictionaryValue->IsType(base::Value::TYPE_DICTIONARY)) { resultValue = dictionaryValue.Pass(); diff --git a/components/domain_reliability/config.cc b/components/domain_reliability/config.cc index 7aaf9a5..6f47154 100644 --- a/components/domain_reliability/config.cc +++ b/components/domain_reliability/config.cc @@ -96,7 +96,7 @@ scoped_ptr<const DomainReliabilityConfig> DomainReliabilityConfig::FromJSON( tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "436671 DomainReliabilityConfig::FromJSON")); - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); base::JSONValueConverter<DomainReliabilityConfig> converter; scoped_ptr<DomainReliabilityConfig> config(new DomainReliabilityConfig()); diff --git a/components/error_page/renderer/net_error_helper_core.cc b/components/error_page/renderer/net_error_helper_core.cc index 33a62d0..dfcd68f 100644 --- a/components/error_page/renderer/net_error_helper_core.cc +++ b/components/error_page/renderer/net_error_helper_core.cc @@ -262,7 +262,7 @@ base::string16 FormatURLForDisplay(const GURL& url, bool is_rtl, scoped_ptr<NavigationCorrectionResponse> ParseNavigationCorrectionResponse( const std::string raw_response) { // TODO(mmenke): Open source related protocol buffers and use them directly. - scoped_ptr<base::Value> parsed(base::JSONReader::Read(raw_response)); + scoped_ptr<base::Value> parsed = base::JSONReader::Read(raw_response); scoped_ptr<NavigationCorrectionResponse> response( new NavigationCorrectionResponse()); base::JSONValueConverter<NavigationCorrectionResponse> converter; diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc index b4047f6..c36f9fd 100644 --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc @@ -313,7 +313,8 @@ scoped_ptr<base::DictionaryValue> WebHistoryService::ReadResponse( WebHistoryService::Request* request) { scoped_ptr<base::DictionaryValue> result; if (request->GetResponseCode() == net::HTTP_OK) { - base::Value* value = base::JSONReader::Read(request->GetResponseBody()); + base::Value* value = + base::JSONReader::DeprecatedRead(request->GetResponseBody()); if (value && value->IsType(base::Value::TYPE_DICTIONARY)) result.reset(static_cast<base::DictionaryValue*>(value)); else diff --git a/components/invalidation/p2p_invalidator.cc b/components/invalidation/p2p_invalidator.cc index e6c03b5..aea1e3a 100644 --- a/components/invalidation/p2p_invalidator.cc +++ b/components/invalidation/p2p_invalidator.cc @@ -112,7 +112,7 @@ std::string P2PNotificationData::ToString() const { } bool P2PNotificationData::ResetFromString(const std::string& str) { - scoped_ptr<base::Value> data_value(base::JSONReader::Read(str)); + scoped_ptr<base::Value> data_value = base::JSONReader::Read(str); const base::DictionaryValue* data_dict = NULL; if (!data_value.get() || !data_value->GetAsDictionary(&data_dict)) { LOG(WARNING) << "Could not parse " << str << " as a dictionary"; diff --git a/components/json_schema/json_schema_validator.cc b/components/json_schema/json_schema_validator.cc index 1899ad6..34ed95e 100644 --- a/components/json_schema/json_schema_validator.cc +++ b/components/json_schema/json_schema_validator.cc @@ -399,8 +399,8 @@ scoped_ptr<base::DictionaryValue> JSONSchemaValidator::IsValidSchema( int validator_options, std::string* error) { base::JSONParserOptions json_options = base::JSON_PARSE_RFC; - scoped_ptr<base::Value> json( - base::JSONReader::ReadAndReturnError(schema, json_options, NULL, error)); + scoped_ptr<base::Value> json(base::JSONReader::DeprecatedReadAndReturnError( + schema, json_options, NULL, error)); if (!json) return scoped_ptr<base::DictionaryValue>(); base::DictionaryValue* dict = NULL; diff --git a/components/omnibox/suggestion_answer_unittest.cc b/components/omnibox/suggestion_answer_unittest.cc index 3252a9f..c876211 100644 --- a/components/omnibox/suggestion_answer_unittest.cc +++ b/components/omnibox/suggestion_answer_unittest.cc @@ -12,7 +12,7 @@ namespace { scoped_ptr<SuggestionAnswer> ParseAnswer(const std::string& answer_json) { - scoped_ptr<base::Value> value(base::JSONReader::Read(answer_json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(answer_json); base::DictionaryValue* dict; if (!value || !value->GetAsDictionary(&dict)) return nullptr; diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc index 832dd71..6e9503d 100644 --- a/components/policy/core/browser/configuration_policy_handler_unittest.cc +++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc @@ -652,8 +652,9 @@ TEST(SchemaValidatingPolicyHandlerTest, CheckAndGetValue) { " \"Colors\": \"White\"" " }" "}"; - scoped_ptr<base::Value> policy_map_value(base::JSONReader::ReadAndReturnError( - kPolicyMapJson, base::JSON_PARSE_RFC, NULL, &error)); + scoped_ptr<base::Value> policy_map_value( + base::JSONReader::DeprecatedReadAndReturnError( + kPolicyMapJson, base::JSON_PARSE_RFC, NULL, &error)); ASSERT_TRUE(policy_map_value) << error; const base::DictionaryValue* policy_map_dict = NULL; @@ -711,8 +712,9 @@ TEST(SimpleSchemaValidatingPolicyHandlerTest, CheckAndGetValue) { " \"Colors\": \"Green\"" " }" "}"; - scoped_ptr<base::Value> policy_map_value(base::JSONReader::ReadAndReturnError( - kPolicyMapJson, base::JSON_PARSE_RFC, NULL, &error)); + scoped_ptr<base::Value> policy_map_value( + base::JSONReader::DeprecatedReadAndReturnError( + kPolicyMapJson, base::JSON_PARSE_RFC, NULL, &error)); ASSERT_TRUE(policy_map_value) << error; const base::DictionaryValue* policy_map_dict = NULL; diff --git a/components/policy/core/common/cloud/component_cloud_policy_store.cc b/components/policy/core/common/cloud/component_cloud_policy_store.cc index 3bd1c1c..dbcff3b 100644 --- a/components/policy/core/common/cloud/component_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/component_cloud_policy_store.cc @@ -323,7 +323,7 @@ bool ComponentCloudPolicyStore::ValidateData( bool ComponentCloudPolicyStore::ParsePolicy(const std::string& data, PolicyMap* policy) { - scoped_ptr<base::Value> json(base::JSONReader::Read( + scoped_ptr<base::Value> json(base::JSONReader::DeprecatedRead( data, base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN)); base::DictionaryValue* dict = NULL; if (!json || !json->GetAsDictionary(&dict)) diff --git a/components/policy/core/common/cloud/policy_header_service_unittest.cc b/components/policy/core/common/cloud/policy_header_service_unittest.cc index 7d5c752..90c5c4b 100644 --- a/components/policy/core/common/cloud/policy_header_service_unittest.cc +++ b/components/policy/core/common/cloud/policy_header_service_unittest.cc @@ -67,7 +67,7 @@ class PolicyHeaderServiceTest : public testing::Test { std::string decoded; base::Base64Decode(header, &decoded); // Parse the JSON. - scoped_ptr<base::Value> value(base::JSONReader::Read(decoded)); + scoped_ptr<base::Value> value = base::JSONReader::Read(decoded); ASSERT_TRUE(value); base::DictionaryValue* dict; EXPECT_TRUE(value->GetAsDictionary(&dict)); diff --git a/components/policy/core/common/cloud/user_info_fetcher.cc b/components/policy/core/common/cloud/user_info_fetcher.cc index b1f6cd9..6c479d0 100644 --- a/components/policy/core/common/cloud/user_info_fetcher.cc +++ b/components/policy/core/common/cloud/user_info_fetcher.cc @@ -75,7 +75,7 @@ void UserInfoFetcher::OnURLFetchComplete(const net::URLFetcher* source) { std::string unparsed_data; source->GetResponseAsString(&unparsed_data); DVLOG(1) << "Received UserInfo response: " << unparsed_data; - scoped_ptr<base::Value> parsed_value(base::JSONReader::Read(unparsed_data)); + scoped_ptr<base::Value> parsed_value = base::JSONReader::Read(unparsed_data); base::DictionaryValue* dict; if (parsed_value.get() && parsed_value->GetAsDictionary(&dict)) { delegate_->OnGetUserInfoSuccess(dict); diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc index f49f944e..449b99f 100644 --- a/components/policy/core/common/policy_loader_win.cc +++ b/components/policy/core/common/policy_loader_win.cc @@ -104,7 +104,7 @@ enum DomainCheckErrors { // add an "items" attribute to lists that don't declare it. std::string PatchSchema(const std::string& schema) { base::JSONParserOptions options = base::JSON_PARSE_RFC; - scoped_ptr<base::Value> json(base::JSONReader::Read(schema, options)); + scoped_ptr<base::Value> json = base::JSONReader::Read(schema, options); base::DictionaryValue* dict = NULL; base::DictionaryValue* properties = NULL; if (!json || diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc index 33a97a0..132adca 100644 --- a/components/policy/core/common/registry_dict_win.cc +++ b/components/policy/core/common/registry_dict_win.cc @@ -115,7 +115,7 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value, case base::Value::TYPE_DICTIONARY: { // Dictionaries may be encoded as JSON strings. if (value.GetAsString(&string_value)) { - scoped_ptr<base::Value> result(base::JSONReader::Read(string_value)); + scoped_ptr<base::Value> result = base::JSONReader::Read(string_value); if (result && result->IsType(schema.type())) return result.Pass(); } diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py index 2a9e645..62a37fb 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -931,7 +931,7 @@ base::ListValue* DecodeStringList(const em::StringList& string_list) { base::Value* DecodeJson(const std::string& json) { scoped_ptr<base::Value> root( - base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS)); + base::JSONReader::DeprecatedRead(json, base::JSON_ALLOW_TRAILING_COMMAS)); if (!root) LOG(WARNING) << "Invalid JSON string, ignoring: " << json; diff --git a/components/proximity_auth/client.cc b/components/proximity_auth/client.cc index 255b6f6..3a03388 100644 --- a/components/proximity_auth/client.cc +++ b/components/proximity_auth/client.cc @@ -194,7 +194,7 @@ void Client::OnConnectionStatusChanged(Connection* connection, void Client::OnMessageReceived(const Connection& connection, const WireMessage& wire_message) { std::string json_message = secure_context_->Decode(wire_message.payload()); - scoped_ptr<base::Value> message_value(base::JSONReader::Read(json_message)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(json_message); if (!message_value || !message_value->IsType(base::Value::TYPE_DICTIONARY)) { VLOG(1) << "[Client] Unable to parse message as JSON: " << json_message << "."; diff --git a/components/proximity_auth/remote_status_update_unittest.cc b/components/proximity_auth/remote_status_update_unittest.cc index 54902b7..91c75e7 100644 --- a/components/proximity_auth/remote_status_update_unittest.cc +++ b/components/proximity_auth/remote_status_update_unittest.cc @@ -14,7 +14,7 @@ namespace { // Parses the |json| into a DictionaryValue. scoped_ptr<base::DictionaryValue> ParseJson(const std::string& json) { base::DictionaryValue* as_dictionary; - base::JSONReader::Read(json)->GetAsDictionary(&as_dictionary); + base::JSONReader::DeprecatedRead(json)->GetAsDictionary(&as_dictionary); return make_scoped_ptr(as_dictionary); } diff --git a/components/proximity_auth/wire_message.cc b/components/proximity_auth/wire_message.cc index 3e0c364..0501359 100644 --- a/components/proximity_auth/wire_message.cc +++ b/components/proximity_auth/wire_message.cc @@ -79,8 +79,8 @@ scoped_ptr<WireMessage> WireMessage::Deserialize( if (!ParseHeader(serialized_message, is_incomplete_message)) return scoped_ptr<WireMessage>(); - scoped_ptr<base::Value> body_value( - base::JSONReader::Read(serialized_message.substr(kHeaderLength))); + scoped_ptr<base::Value> body_value(base::JSONReader::DeprecatedRead( + serialized_message.substr(kHeaderLength))); if (!body_value || !body_value->IsType(base::Value::TYPE_DICTIONARY)) { VLOG(1) << "Error: Unable to parse message as JSON."; return scoped_ptr<WireMessage>(); diff --git a/components/search_provider_logos/google_logo_api.cc b/components/search_provider_logos/google_logo_api.cc index f92e679..5010e2c 100644 --- a/components/search_provider_logos/google_logo_api.cc +++ b/components/search_provider_logos/google_logo_api.cc @@ -66,7 +66,7 @@ scoped_ptr<EncodedLogo> GoogleParseLogoResponse( if (response_sp.starts_with(kResponsePreamble)) response_sp.remove_prefix(strlen(kResponsePreamble)); - scoped_ptr<base::Value> value(base::JSONReader::Read(response_sp)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response_sp); if (!value.get()) return scoped_ptr<EncodedLogo>(); diff --git a/components/search_provider_logos/logo_cache.cc b/components/search_provider_logos/logo_cache.cc index c6272ee..6f0ae36 100644 --- a/components/search_provider_logos/logo_cache.cc +++ b/components/search_provider_logos/logo_cache.cc @@ -115,7 +115,7 @@ scoped_ptr<EncodedLogo> LogoCache::GetCachedLogo() { // static scoped_ptr<LogoMetadata> LogoCache::LogoMetadataFromString( const std::string& str, int* logo_num_bytes) { - scoped_ptr<base::Value> value(base::JSONReader::Read(str)); + scoped_ptr<base::Value> value = base::JSONReader::Read(str); base::DictionaryValue* dict; if (!value || !value->GetAsDictionary(&dict)) return scoped_ptr<LogoMetadata>(); diff --git a/components/signin/core/browser/gaia_cookie_manager_service.cc b/components/signin/core/browser/gaia_cookie_manager_service.cc index 512dee7..dc762e2 100644 --- a/components/signin/core/browser/gaia_cookie_manager_service.cc +++ b/components/signin/core/browser/gaia_cookie_manager_service.cc @@ -146,7 +146,7 @@ void GaiaCookieManagerService::ExternalCcResultFetcher:: OnGetCheckConnectionInfoSuccess(const std::string& data) { helper_->fetcher_backoff_.InformOfRequest(true); gaia_auth_fetcher_timer_.Stop(); - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); const base::ListValue* list; if (!value || !value->GetAsList(&list)) { CleanupTransientState(); diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc index d791c01..959b576 100644 --- a/components/translate/core/browser/translate_language_list.cc +++ b/components/translate/core/browser/translate_language_list.cc @@ -279,8 +279,8 @@ void TranslateLanguageList::SetSupportedLanguages( kLanguageListCallbackNameLength, language_list.size() - kLanguageListCallbackNameLength - 1); - scoped_ptr<base::Value> json_value( - base::JSONReader::Read(languages_json, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> json_value(base::JSONReader::DeprecatedRead( + languages_json, base::JSON_ALLOW_TRAILING_COMMAS)); if (json_value == NULL || !json_value->IsType(base::Value::TYPE_DICTIONARY)) { NOTREACHED(); diff --git a/components/webcrypto/jwk.cc b/components/webcrypto/jwk.cc index 8a9ad74..98a8b1b 100644 --- a/components/webcrypto/jwk.cc +++ b/components/webcrypto/jwk.cc @@ -199,7 +199,7 @@ Status JwkReader::Init(const CryptoData& bytes, base::StringPiece json_string(reinterpret_cast<const char*>(bytes.bytes()), bytes.byte_length()); - scoped_ptr<base::Value> value(base::JSONReader::Read(json_string)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json_string); base::DictionaryValue* dict_value = NULL; if (!value.get() || !value->GetAsDictionary(&dict_value) || !dict_value) diff --git a/components/webcrypto/test/test_helpers.cc b/components/webcrypto/test/test_helpers.cc index 8e24c95..4684c40 100644 --- a/components/webcrypto/test/test_helpers.cc +++ b/components/webcrypto/test/test_helpers.cc @@ -195,7 +195,7 @@ std::vector<uint8_t> MakeJsonVector(const base::DictionaryValue& dict) { re2::RE2::GlobalReplace(&file_contents, re2::RE2("\\s*//.*"), ""); // Parse the JSON to a dictionary. - value->reset(base::JSONReader::Read(file_contents)); + value->reset(base::JSONReader::DeprecatedRead(file_contents)); if (!value->get()) { return ::testing::AssertionFailure() << "Couldn't parse test file JSON: " << file_path.value(); @@ -422,7 +422,7 @@ scoped_ptr<base::DictionaryValue> GetJwkDictionary( const std::vector<uint8_t>& json) { base::StringPiece json_string( reinterpret_cast<const char*>(vector_as_array(&json)), json.size()); - base::Value* value = base::JSONReader::Read(json_string); + base::Value* value = base::JSONReader::DeprecatedRead(json_string); EXPECT_TRUE(value); base::DictionaryValue* dict_value = NULL; value->GetAsDictionary(&dict_value); diff --git a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc index 573aca4..666a829 100644 --- a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc +++ b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc @@ -85,8 +85,8 @@ class DevToolsProtocolTest : public ContentBrowserTest, private: void DispatchProtocolMessage(DevToolsAgentHost* agent_host, const std::string& message) override { - scoped_ptr<base::DictionaryValue> root( - static_cast<base::DictionaryValue*>(base::JSONReader::Read(message))); + scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>( + base::JSONReader::DeprecatedRead(message))); base::DictionaryValue* result; EXPECT_TRUE(root->GetDictionary("result", &result)); result_.reset(result->DeepCopy()); diff --git a/content/browser/devtools/protocol/devtools_protocol_handler.cc b/content/browser/devtools/protocol/devtools_protocol_handler.cc index 2841219..c57a673 100644 --- a/content/browser/devtools/protocol/devtools_protocol_handler.cc +++ b/content/browser/devtools/protocol/devtools_protocol_handler.cc @@ -42,7 +42,7 @@ DevToolsProtocolHandler::~DevToolsProtocolHandler() { scoped_ptr<base::DictionaryValue> DevToolsProtocolHandler::ParseCommand(const std::string& message) { - scoped_ptr<base::Value> value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> value = base::JSONReader::Read(message); if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { client_.SendError(DevToolsProtocolClient::kNoId, Response(kStatusParseError, diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index cc43330..2e8bb4f 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -259,11 +259,8 @@ class GeolocationNetworkProviderTest : public testing::Test { ASSERT_FALSE(upload_data.empty()); std::string json_parse_error_msg; scoped_ptr<base::Value> parsed_json( - base::JSONReader::ReadAndReturnError( - upload_data, - base::JSON_PARSE_RFC, - NULL, - &json_parse_error_msg)); + base::JSONReader::DeprecatedReadAndReturnError( + upload_data, base::JSON_PARSE_RFC, NULL, &json_parse_error_msg)); EXPECT_TRUE(json_parse_error_msg.empty()); ASSERT_TRUE(parsed_json.get() != NULL); diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc index 2a6c17c..b1bf408 100644 --- a/content/browser/geolocation/network_location_request.cc +++ b/content/browser/geolocation/network_location_request.cc @@ -366,8 +366,9 @@ bool ParseServerResponse(const std::string& response_body, // Parse the response, ignoring comments. std::string error_msg; - scoped_ptr<base::Value> response_value(base::JSONReader::ReadAndReturnError( - response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); + scoped_ptr<base::Value> response_value( + base::JSONReader::DeprecatedReadAndReturnError( + response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); if (response_value == NULL) { LOG(WARNING) << "ParseServerResponse() : JSONReader failed : " << error_msg; diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc index ad43e33..1f56403 100644 --- a/content/browser/media/media_internals_unittest.cc +++ b/content/browser/media/media_internals_unittest.cc @@ -41,8 +41,8 @@ class MediaInternalsTestBase { std::string utf8_update = base::UTF16ToUTF8(update); const std::string::size_type first_brace = utf8_update.find('{'); const std::string::size_type last_brace = utf8_update.rfind('}'); - scoped_ptr<base::Value> output_value(base::JSONReader::Read( - utf8_update.substr(first_brace, last_brace - first_brace + 1))); + scoped_ptr<base::Value> output_value = base::JSONReader::Read( + utf8_update.substr(first_brace, last_brace - first_brace + 1)); CHECK(output_value); base::DictionaryValue* output_dict = NULL; diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index d7bca4f..123c111 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -200,10 +200,9 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest { int error_code; std::string error_message; scoped_ptr<base::Value> value( - base::JSONReader::ReadAndReturnError(devices_as_json, - base::JSON_ALLOW_TRAILING_COMMAS, - &error_code, - &error_message)); + base::JSONReader::DeprecatedReadAndReturnError( + devices_as_json, base::JSON_ALLOW_TRAILING_COMMAS, &error_code, + &error_message)); ASSERT_TRUE(value.get() != NULL) << error_message; EXPECT_EQ(value->GetType(), base::Value::TYPE_LIST); diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 05c42cc..70acc33 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -234,7 +234,7 @@ class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest { "JSON.stringify(userMediaRequests));", &json_requests)); scoped_ptr<base::Value> value_requests; - value_requests.reset(base::JSONReader::Read(json_requests)); + value_requests.reset(base::JSONReader::DeprecatedRead(json_requests)); EXPECT_EQ(base::Value::TYPE_LIST, value_requests->GetType()); @@ -784,7 +784,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) { "JSON.stringify(peerConnectionDataStore));", &dump_json)); scoped_ptr<base::Value> dump; - dump.reset(base::JSONReader::Read(dump_json)); + dump.reset(base::JSONReader::DeprecatedRead(dump_json)); VerifyPageDumpStructure(dump.get(), 2 /*peer_connection_number*/, 2 /*update_number*/, @@ -803,7 +803,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) { "window.domAutomationController.send(" "JSON.stringify(peerConnectionDataStore));", &dump_json)); - dump.reset(base::JSONReader::Read(dump_json)); + dump.reset(base::JSONReader::DeprecatedRead(dump_json)); VerifyStatsDump(dump.get(), pc_0, type, id, stats); } diff --git a/content/browser/speech/google_one_shot_remote_engine.cc b/content/browser/speech/google_one_shot_remote_engine.cc index 77f5c2c..92e4cb3 100644 --- a/content/browser/speech/google_one_shot_remote_engine.cc +++ b/content/browser/speech/google_one_shot_remote_engine.cc @@ -47,8 +47,9 @@ bool ParseServerResponse(const std::string& response_body, // Parse the response, ignoring comments. std::string error_msg; - scoped_ptr<base::Value> response_value(base::JSONReader::ReadAndReturnError( - response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); + scoped_ptr<base::Value> response_value( + base::JSONReader::DeprecatedReadAndReturnError( + response_body, base::JSON_PARSE_RFC, NULL, &error_msg)); if (response_value == NULL) { LOG(WARNING) << "ParseServerResponse: JSONReader failed : " << error_msg; return false; diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index 546fd74..95edb0d 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -60,7 +60,7 @@ bool GetTracingOptions(const std::string& data64, return false; } - scoped_ptr<base::Value> optionsRaw(base::JSONReader::Read(data)); + scoped_ptr<base::Value> optionsRaw = base::JSONReader::Read(data); if (!optionsRaw) { LOG(ERROR) << "Options were not valid JSON"; return false; diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc index 6064054..6ac9d0e 100644 --- a/content/common/gpu/client/gl_helper_unittest.cc +++ b/content/common/gpu/client/gl_helper_unittest.cc @@ -112,7 +112,8 @@ class GLHelperTest : public testing::Test { std::string error_msg; scoped_ptr<base::Value> trace_data( - base::JSONReader::ReadAndReturnError(json_data, 0, NULL, &error_msg)); + base::JSONReader::DeprecatedReadAndReturnError(json_data, 0, NULL, + &error_msg)); CHECK(trace_data) << "JSON parsing failed (" << error_msg << ") JSON data:" << std::endl << json_data; diff --git a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc index eedb97a..28b1793 100644 --- a/content/renderer/devtools/v8_sampling_profiler_browsertest.cc +++ b/content/renderer/devtools/v8_sampling_profiler_browsertest.cc @@ -54,7 +54,7 @@ class V8SamplingProfilerTest : public RenderViewTest { trace_buffer_.Finish(); scoped_ptr<Value> root; - root.reset(base::JSONReader::Read( + root.reset(base::JSONReader::DeprecatedRead( json_output_.json_output, base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN)); diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc index bb4fc4e..924d2aa 100644 --- a/content/renderer/manifest/manifest_parser.cc +++ b/content/renderer/manifest/manifest_parser.cc @@ -100,9 +100,8 @@ ManifestParser::~ManifestParser() { void ManifestParser::Parse() { std::string parse_error; - scoped_ptr<base::Value> value( - base::JSONReader::ReadAndReturnError(data_, base::JSON_PARSE_RFC, - nullptr, &parse_error)); + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedReadAndReturnError( + data_, base::JSON_PARSE_RFC, nullptr, &parse_error)); if (!value) { errors_.push_back(GetErrorPrefix() + parse_error); diff --git a/content/shell/browser/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc index 2ad0c2e..7f71952 100644 --- a/content/shell/browser/shell_devtools_frontend.cc +++ b/content/shell/browser/shell_devtools_frontend.cc @@ -179,7 +179,7 @@ void ShellDevToolsFrontend::HandleMessageFromDevToolsFrontend( std::string method; base::ListValue* params = NULL; base::DictionaryValue* dict = NULL; - scoped_ptr<base::Value> parsed_message(base::JSONReader::Read(message)); + scoped_ptr<base::Value> parsed_message = base::JSONReader::Read(message); if (!parsed_message || !parsed_message->GetAsDictionary(&dict) || !dict->GetString("method", &method)) { diff --git a/extensions/browser/api_test_utils.cc b/extensions/browser/api_test_utils.cc index 1aec2af..4affb86 100644 --- a/extensions/browser/api_test_utils.cc +++ b/extensions/browser/api_test_utils.cc @@ -30,15 +30,16 @@ class TestFunctionDispatcherDelegate DISALLOW_COPY_AND_ASSIGN(TestFunctionDispatcherDelegate); }; -base::Value* ParseJSON(const std::string& data) { +scoped_ptr<base::Value> ParseJSON(const std::string& data) { return base::JSONReader::Read(data); } -base::ListValue* ParseList(const std::string& data) { - base::Value* result = ParseJSON(data); - base::ListValue* list = NULL; - result->GetAsList(&list); - return list; +scoped_ptr<base::ListValue> ParseList(const std::string& data) { + scoped_ptr<base::Value> result = ParseJSON(data); + scoped_ptr<base::ListValue> list_result; + if (result->GetAsList(nullptr)) + list_result.reset(static_cast<base::ListValue*>(result.release())); + return list_result; } // This helps us be able to wait until an UIThreadExtensionFunction calls @@ -84,11 +85,12 @@ namespace extensions { namespace api_test_utils { -base::DictionaryValue* ParseDictionary(const std::string& data) { - base::Value* result = ParseJSON(data); - base::DictionaryValue* dict = NULL; - result->GetAsDictionary(&dict); - return dict; +scoped_ptr<base::DictionaryValue> ParseDictionary(const std::string& data) { + scoped_ptr<base::Value> result = ParseJSON(data); + scoped_ptr<base::DictionaryValue> dict_result; + if (result->GetAsDictionary(nullptr)) + dict_result.reset(static_cast<base::DictionaryValue*>(result.release())); + return dict_result; } bool GetBoolean(const base::DictionaryValue* val, const std::string& key) { @@ -137,8 +139,8 @@ scoped_refptr<Extension> CreateExtension( scoped_refptr<Extension> CreateEmptyExtensionWithLocation( Manifest::Location location) { - scoped_ptr<base::DictionaryValue> test_extension_value( - ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}")); + scoped_ptr<base::DictionaryValue> test_extension_value = + ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}"); return CreateExtension(location, test_extension_value.get(), std::string()); } @@ -226,7 +228,7 @@ bool RunFunction(UIThreadExtensionFunction* function, content::BrowserContext* context, scoped_ptr<extensions::ExtensionFunctionDispatcher> dispatcher, RunFunctionFlags flags) { - scoped_ptr<base::ListValue> parsed_args(ParseList(args)); + scoped_ptr<base::ListValue> parsed_args = ParseList(args); EXPECT_TRUE(parsed_args.get()) << "Could not parse extension function arguments: " << args; return RunFunction( diff --git a/extensions/browser/api_test_utils.h b/extensions/browser/api_test_utils.h index 5429317..0a74f82 100644 --- a/extensions/browser/api_test_utils.h +++ b/extensions/browser/api_test_utils.h @@ -38,7 +38,7 @@ enum RunFunctionFlags { NONE = 0, INCLUDE_INCOGNITO = 1 << 0 }; // Parse JSON and return as the specified type, or NULL if the JSON is invalid // or not the specified type. -base::DictionaryValue* ParseDictionary(const std::string& data); +scoped_ptr<base::DictionaryValue> ParseDictionary(const std::string& data); // Get |key| from |val| as the specified type. If |key| does not exist, or is // not of the specified type, adds a failure to the current test and returns diff --git a/google_apis/drive/base_requests.cc b/google_apis/drive/base_requests.cc index 757b2de..8c0cf8d 100644 --- a/google_apis/drive/base_requests.cc +++ b/google_apis/drive/base_requests.cc @@ -142,7 +142,7 @@ namespace google_apis { scoped_ptr<base::Value> ParseJson(const std::string& json) { int error_code = -1; std::string error_message; - scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedReadAndReturnError( json, base::JSON_PARSE_RFC, &error_code, &error_message)); if (!value.get()) { diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index fbf8962..5e11fbd 100644 --- a/google_apis/drive/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc @@ -1941,12 +1941,13 @@ TEST_F(DriveApiRequestsTest, PermissionsInsertRequest) { http_request_.relative_url); EXPECT_EQ("application/json", http_request_.headers["Content-Type"]); - scoped_ptr<base::Value> expected(base::JSONReader::Read( + scoped_ptr<base::Value> expected(base::JSONReader::DeprecatedRead( "{\"additionalRoles\":[\"commenter\"], \"role\":\"reader\", " "\"type\":\"user\",\"value\":\"user@example.com\"}")); ASSERT_TRUE(expected); - scoped_ptr<base::Value> result(base::JSONReader::Read(http_request_.content)); + scoped_ptr<base::Value> result = + base::JSONReader::Read(http_request_.content); EXPECT_TRUE(http_request_.has_content); EXPECT_TRUE(base::Value::Equals(expected.get(), result.get())); @@ -1975,11 +1976,11 @@ TEST_F(DriveApiRequestsTest, PermissionsInsertRequest) { http_request_.relative_url); EXPECT_EQ("application/json", http_request_.headers["Content-Type"]); - expected.reset(base::JSONReader::Read( + expected.reset(base::JSONReader::DeprecatedRead( "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}")); ASSERT_TRUE(expected); - result.reset(base::JSONReader::Read(http_request_.content)); + result.reset(base::JSONReader::DeprecatedRead(http_request_.content)); EXPECT_TRUE(http_request_.has_content); EXPECT_TRUE(base::Value::Equals(expected.get(), result.get())); } diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc index b19e5f4..b675aa1 100644 --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc @@ -51,7 +51,7 @@ bool ExtractOAuth2TokenPairResponse(const std::string& data, DCHECK(access_token); DCHECK(expires_in_secs); - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY) return false; @@ -550,7 +550,7 @@ bool GaiaAuthFetcher::ParseListIdpSessionsResponse(const std::string& data, std::string* login_hint) { DCHECK(login_hint); - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY) return false; diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc index d643fc3..3a9ccab 100644 --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc @@ -99,7 +99,7 @@ bool ParseListAccountsData( accounts->clear(); // Parse returned data and make sure we have data. - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value) return false; diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index ab1f5d6..14c3cc3 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc @@ -267,7 +267,7 @@ void GaiaOAuthClient::Core::HandleResponse( if (source->GetResponseCode() == net::HTTP_OK) { std::string data; source->GetResponseAsString(&data); - scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); if (message_value.get() && message_value->IsType(base::Value::TYPE_DICTIONARY)) { response_dict.reset( diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc index 530baef..d181df1 100644 --- a/google_apis/gaia/gaia_oauth_client_unittest.cc +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc @@ -368,7 +368,7 @@ TEST_F(GaiaOAuthClientTest, GetUserInfo) { auth.GetUserInfo("access_token", 1, &delegate); scoped_ptr<base::Value> value( - base::JSONReader::Read(kDummyFullUserInfoResult)); + base::JSONReader::DeprecatedRead(kDummyFullUserInfoResult)); DCHECK(value); ASSERT_TRUE(value->IsType(base::Value::TYPE_DICTIONARY)); base::DictionaryValue* expected_result; diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc index 1d5980e..b513b78 100644 --- a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc @@ -119,7 +119,7 @@ scoped_ptr<base::DictionaryValue> ParseGetAccessTokenResponse( std::string data; source->GetResponseAsString(&data); - scoped_ptr<base::Value> value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data); if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY) value.reset(); diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc index 99562b0..f09174c 100644 --- a/google_apis/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.cc @@ -67,7 +67,7 @@ static GoogleServiceAuthError CreateAuthError(const net::URLFetcher* source) { std::string response_body; source->GetResponseAsString(&response_body); - scoped_ptr<base::Value> value(base::JSONReader::Read(response_body)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response_body); base::DictionaryValue* response; if (!value.get() || !value->GetAsDictionary(&response)) { return GoogleServiceAuthError::FromUnexpectedServiceResponse( @@ -178,7 +178,7 @@ void OAuth2MintTokenFlow::ProcessApiCallSuccess( const net::URLFetcher* source) { std::string response_body; source->GetResponseAsString(&response_body); - scoped_ptr<base::Value> value(base::JSONReader::Read(response_body)); + scoped_ptr<base::Value> value = base::JSONReader::Read(response_body); base::DictionaryValue* dict = NULL; if (!value.get() || !value->GetAsDictionary(&dict)) { ReportFailure(GoogleServiceAuthError::FromUnexpectedServiceResponse( diff --git a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc index 52b9ee1..89d5bfd 100644 --- a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc +++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc @@ -176,7 +176,7 @@ class OAuth2MintTokenFlowTest : public testing::Test { // Helper to parse the given string to DictionaryValue. static base::DictionaryValue* ParseJson(const std::string& str) { - scoped_ptr<base::Value> value(base::JSONReader::Read(str)); + scoped_ptr<base::Value> value = base::JSONReader::Read(str); EXPECT_TRUE(value.get()); EXPECT_EQ(base::Value::TYPE_DICTIONARY, value->GetType()); return static_cast<base::DictionaryValue*>(value.release()); diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc index f71c15f..fddcea4 100644 --- a/gpu/config/gpu_control_list.cc +++ b/gpu/config/gpu_control_list.cc @@ -1337,8 +1337,7 @@ GpuControlList::~GpuControlList() { bool GpuControlList::LoadList( const std::string& json_context, GpuControlList::OsFilter os_filter) { - scoped_ptr<base::Value> root; - root.reset(base::JSONReader::Read(json_context)); + scoped_ptr<base::Value> root = base::JSONReader::Read(json_context); if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY)) return false; diff --git a/gpu/config/gpu_control_list_entry_unittest.cc b/gpu/config/gpu_control_list_entry_unittest.cc index f955bdb..d52ad6c 100644 --- a/gpu/config/gpu_control_list_entry_unittest.cc +++ b/gpu/config/gpu_control_list_entry_unittest.cc @@ -30,10 +30,9 @@ class GpuControlListEntryTest : public testing::Test { static ScopedEntry GetEntryFromString( const std::string& json, bool supports_feature_type_all) { - scoped_ptr<base::Value> root; - root.reset(base::JSONReader::Read(json)); + scoped_ptr<base::Value> root = base::JSONReader::Read(json); base::DictionaryValue* value = NULL; - if (root.get() == NULL || !root->GetAsDictionary(&value)) + if (!root || !root->GetAsDictionary(&value)) return NULL; GpuControlList::FeatureMap feature_map; diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index ff60961..f2369df 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -458,14 +458,11 @@ RenderNode* BuildRenderTreeFromFile(const base::FilePath& path) { if (!ReadFileToString(path, &contents)) return NULL; - scoped_ptr<base::Value> root; int error_code = 0; string error_message; - root.reset(JSONReader::ReadAndReturnError(contents, - base::JSON_ALLOW_TRAILING_COMMAS, - &error_code, - &error_message)); - if (!root.get()) { + scoped_ptr<base::Value> root = JSONReader::ReadAndReturnError( + contents, base::JSON_ALLOW_TRAILING_COMMAS, &error_code, &error_message); + if (!root) { LOG(ERROR) << "Failed to parse JSON file " << path.LossyDisplayName() << "\n(" << error_message << ")"; return NULL; diff --git a/net/cert/crl_set_storage.cc b/net/cert/crl_set_storage.cc index 84c7aa4..a952584 100644 --- a/net/cert/crl_set_storage.cc +++ b/net/cert/crl_set_storage.cc @@ -124,7 +124,7 @@ static base::DictionaryValue* ReadHeader(base::StringPiece* data) { const base::StringPiece header_bytes(data->data(), header_len); data->remove_prefix(header_len); - scoped_ptr<base::Value> header(base::JSONReader::Read( + scoped_ptr<base::Value> header(base::JSONReader::DeprecatedRead( header_bytes, base::JSON_ALLOW_TRAILING_COMMAS)); if (header.get() == NULL) return NULL; diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 2242200..65df808 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc @@ -188,7 +188,7 @@ bool TransportSecurityPersister::LoadEntries(const std::string& serialized, bool TransportSecurityPersister::Deserialize(const std::string& serialized, bool* dirty, TransportSecurityState* state) { - scoped_ptr<base::Value> value(base::JSONReader::Read(serialized)); + scoped_ptr<base::Value> value = base::JSONReader::Read(serialized); base::DictionaryValue* dict_value = NULL; if (!value.get() || !value->GetAsDictionary(&dict_value)) return false; diff --git a/net/log/trace_net_log_observer_unittest.cc b/net/log/trace_net_log_observer_unittest.cc index 15f4926..d32b8cd 100644 --- a/net/log/trace_net_log_observer_unittest.cc +++ b/net/log/trace_net_log_observer_unittest.cc @@ -75,7 +75,7 @@ class TraceNetLogObserverTest : public testing::Test { trace_buffer_.Finish(); scoped_ptr<base::Value> trace_value; - trace_value.reset(base::JSONReader::Read( + trace_value.reset(base::JSONReader::DeprecatedRead( json_output_.json_output, base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN)); diff --git a/net/test/spawned_test_server/spawner_communicator.cc b/net/test/spawned_test_server/spawner_communicator.cc index d16e57a..59b9066 100644 --- a/net/test/spawned_test_server/spawner_communicator.cc +++ b/net/test/spawned_test_server/spawner_communicator.cc @@ -336,7 +336,7 @@ bool SpawnerCommunicator::StartServer(const std::string& arguments, return false; // Check whether the data returned from spawner server is JSON-formatted. - scoped_ptr<base::Value> value(base::JSONReader::Read(server_return_data)); + scoped_ptr<base::Value> value = base::JSONReader::Read(server_return_data); if (!value.get() || !value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(ERROR) << "Invalid server data: " << server_return_data.c_str(); return false; diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc index 5dbcead..549d11c 100644 --- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc +++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc @@ -58,7 +58,7 @@ bool ReadTestCase(const char* filename, return false; } - scoped_ptr<base::Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value = base::JSONReader::Read(json); if (!value.get()) { LOG(ERROR) << filename << ": couldn't parse JSON."; return false; diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 13e36ee..26cf492 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -301,9 +301,8 @@ void ChromotingInstance::HandleMessage(const pp::Var& message) { return; } - scoped_ptr<base::Value> json( - base::JSONReader::Read(message.AsString(), - base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> json(base::JSONReader::DeprecatedRead( + message.AsString(), base::JSON_ALLOW_TRAILING_COMMAS)); base::DictionaryValue* message_dict = nullptr; std::string method; base::DictionaryValue* data = nullptr; diff --git a/remoting/host/cast_extension_session.cc b/remoting/host/cast_extension_session.cc index 843a79d..d43beff 100644 --- a/remoting/host/cast_extension_session.cc +++ b/remoting/host/cast_extension_session.cc @@ -266,7 +266,7 @@ bool CastExtensionSession::OnExtensionMessage( return false; } - scoped_ptr<base::Value> value(base::JSONReader::Read(message.data())); + scoped_ptr<base::Value> value = base::JSONReader::Read(message.data()); base::DictionaryValue* client_message; if (!(value && value->GetAsDictionary(&client_message))) { LOG(ERROR) << "Could not read cast extension message."; diff --git a/remoting/host/gnubby_auth_handler_posix.cc b/remoting/host/gnubby_auth_handler_posix.cc index 4639f01..b98a7f7 100644 --- a/remoting/host/gnubby_auth_handler_posix.cc +++ b/remoting/host/gnubby_auth_handler_posix.cc @@ -111,7 +111,7 @@ void GnubbyAuthHandler::SetGnubbySocketName( void GnubbyAuthHandlerPosix::DeliverClientMessage(const std::string& message) { DCHECK(CalledOnValidThread()); - scoped_ptr<base::Value> value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> value = base::JSONReader::Read(message); base::DictionaryValue* client_message; if (value && value->GetAsDictionary(&client_message)) { std::string type; diff --git a/remoting/host/host_config.cc b/remoting/host/host_config.cc index 2250d6f..dc5838e 100644 --- a/remoting/host/host_config.cc +++ b/remoting/host/host_config.cc @@ -15,7 +15,7 @@ namespace remoting { scoped_ptr<base::DictionaryValue> HostConfigFromJson( const std::string& json) { scoped_ptr<base::Value> value( - base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS)); + base::JSONReader::DeprecatedRead(json, base::JSON_ALLOW_TRAILING_COMMAS)); if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Failed to parse host config from JSON"; return nullptr; diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc index 441224e..415681c 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.cc +++ b/remoting/host/it2me/it2me_native_messaging_host.cc @@ -77,7 +77,7 @@ void It2MeNativeMessagingHost::OnMessage(const std::string& message) { DCHECK(task_runner()->BelongsToCurrentThread()); scoped_ptr<base::DictionaryValue> response(new base::DictionaryValue()); - scoped_ptr<base::Value> message_value(base::JSONReader::Read(message)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(message); if (!message_value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(ERROR) << "Received a message that's not a dictionary."; client_->CloseChannel(std::string()); diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index cfe66bb..03b7fc9 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc @@ -278,7 +278,7 @@ It2MeNativeMessagingHostTest::ReadMessageFromOutputPipe() { return nullptr; } - scoped_ptr<base::Value> message(base::JSONReader::Read(message_json)); + scoped_ptr<base::Value> message = base::JSONReader::Read(message_json); if (!message || !message->IsType(base::Value::TYPE_DICTIONARY)) { LOG(ERROR) << "Malformed message:" << message_json; return nullptr; diff --git a/remoting/host/native_messaging/native_messaging_pipe.cc b/remoting/host/native_messaging/native_messaging_pipe.cc index da204d1..58fc532 100644 --- a/remoting/host/native_messaging/native_messaging_pipe.cc +++ b/remoting/host/native_messaging/native_messaging_pipe.cc @@ -38,7 +38,7 @@ void NativeMessagingPipe::OnDisconnect() { void NativeMessagingPipe::PostMessageFromNativeHost( const std::string& message) { - scoped_ptr<base::Value> json(base::JSONReader::Read(message)); + scoped_ptr<base::Value> json = base::JSONReader::Read(message); channel_->SendMessage(json.Pass()); } diff --git a/remoting/host/native_messaging/native_messaging_reader.cc b/remoting/host/native_messaging/native_messaging_reader.cc index b2ff66d..ab90a7e 100644 --- a/remoting/host/native_messaging/native_messaging_reader.cc +++ b/remoting/host/native_messaging/native_messaging_reader.cc @@ -109,7 +109,7 @@ void NativeMessagingReader::Core::ReadMessage() { return; } - scoped_ptr<base::Value> message(base::JSONReader::Read(message_json)); + scoped_ptr<base::Value> message = base::JSONReader::Read(message_json); if (!message) { LOG(ERROR) << "Failed to parse JSON message: " << message; NotifyEof(); diff --git a/remoting/host/native_messaging/native_messaging_writer_unittest.cc b/remoting/host/native_messaging/native_messaging_writer_unittest.cc index fddd7e7..49e5dbd 100644 --- a/remoting/host/native_messaging/native_messaging_writer_unittest.cc +++ b/remoting/host/native_messaging/native_messaging_writer_unittest.cc @@ -50,7 +50,7 @@ TEST_F(NativeMessagingWriterTest, GoodMessage) { EXPECT_EQ(static_cast<int>(length), read); // |content| should now contain serialized |message|. - scoped_ptr<base::Value> written_message(base::JSONReader::Read(content)); + scoped_ptr<base::Value> written_message = base::JSONReader::Read(content); EXPECT_TRUE(message.Equals(written_message.get())); // Nothing more should have been written. Close the write-end of the pipe, @@ -82,7 +82,7 @@ TEST_F(NativeMessagingWriterTest, SecondMessage) { } // |content| should now contain serialized |message2|. - scoped_ptr<base::Value> written_message2(base::JSONReader::Read(content)); + scoped_ptr<base::Value> written_message2 = base::JSONReader::Read(content); EXPECT_TRUE(message2.Equals(written_message2.get())); } diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc index 60f14c9..5ea71d9 100644 --- a/remoting/host/policy_watcher.cc +++ b/remoting/host/policy_watcher.cc @@ -67,7 +67,7 @@ scoped_ptr<base::DictionaryValue> CopyValuesAndAddDefaults( std::string policy_overrides; if (from.GetString(key::kRemoteAccessHostDebugOverridePolicies, &policy_overrides)) { - scoped_ptr<base::Value> value(base::JSONReader::Read(policy_overrides)); + scoped_ptr<base::Value> value = base::JSONReader::Read(policy_overrides); const base::DictionaryValue* override_values; if (value && value->GetAsDictionary(&override_values)) { to->MergeDictionary(override_values); diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc index 1795110..7b33664 100644 --- a/remoting/host/setup/daemon_controller_delegate_win.cc +++ b/remoting/host/setup/daemon_controller_delegate_win.cc @@ -72,8 +72,8 @@ bool ReadConfig(const base::FilePath& filename, } // Parse the JSON configuration, expecting it to contain a dictionary. - scoped_ptr<base::Value> value( - base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> value(base::JSONReader::DeprecatedRead( + file_content, base::JSON_ALLOW_TRAILING_COMMAS)); base::DictionaryValue* dictionary; if (!value || !value->GetAsDictionary(&dictionary)) { @@ -156,7 +156,7 @@ bool WriteConfig(const std::string& content) { } // Extract the configuration data that the user will verify. - scoped_ptr<base::Value> config_value(base::JSONReader::Read(content)); + scoped_ptr<base::Value> config_value = base::JSONReader::Read(content); if (!config_value.get()) { return false; } diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc index b44c2bd..ed34cbe 100644 --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc @@ -397,7 +397,7 @@ Me2MeNativeMessagingHostTest::ReadMessageFromOutputPipe() { return nullptr; } - scoped_ptr<base::Value> message(base::JSONReader::Read(message_json)); + scoped_ptr<base::Value> message = base::JSONReader::Read(message_json); if (!message || !message->IsType(base::Value::TYPE_DICTIONARY)) { return nullptr; } diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc index f99f6a6..ba42825 100644 --- a/remoting/host/setup/service_client.cc +++ b/remoting/host/setup/service_client.cc @@ -145,7 +145,7 @@ void ServiceClient::Core::HandleResponse(const net::URLFetcher* source) { { std::string data; source->GetResponseAsString(&data); - scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + scoped_ptr<base::Value> message_value = base::JSONReader::Read(data); base::DictionaryValue *dict; std::string code; if (message_value.get() && diff --git a/remoting/host/token_validator_base.cc b/remoting/host/token_validator_base.cc index 5937c57..d1a8ee7a 100644 --- a/remoting/host/token_validator_base.cc +++ b/remoting/host/token_validator_base.cc @@ -176,7 +176,7 @@ std::string TokenValidatorBase::ProcessResponse() { } // Decode the JSON data from the response. - scoped_ptr<base::Value> value(base::JSONReader::Read(data_)); + scoped_ptr<base::Value> value = base::JSONReader::Read(data_); base::DictionaryValue* dict; if (!value || !value->GetAsDictionary(&dict)) { LOG(ERROR) << "Invalid token validation response: '" << data_ << "'"; diff --git a/remoting/host/video_frame_recorder_host_extension.cc b/remoting/host/video_frame_recorder_host_extension.cc index efa110e..1839163 100644 --- a/remoting/host/video_frame_recorder_host_extension.cc +++ b/remoting/host/video_frame_recorder_host_extension.cc @@ -82,7 +82,7 @@ bool VideoFrameRecorderHostExtensionSession::OnExtensionMessage( return true; } - scoped_ptr<base::Value> value(base::JSONReader::Read(message.data())); + scoped_ptr<base::Value> value = base::JSONReader::Read(message.data()); base::DictionaryValue* client_message; if (!value || !value->GetAsDictionary(&client_message)) { return true; diff --git a/remoting/test/app_remoting_connected_client_fixture.cc b/remoting/test/app_remoting_connected_client_fixture.cc index 090c221..806d441 100644 --- a/remoting/test/app_remoting_connected_client_fixture.cc +++ b/remoting/test/app_remoting_connected_client_fixture.cc @@ -216,7 +216,7 @@ void AppRemotingConnectedClientFixture::HandleOnWindowAddedMessage( DCHECK_EQ(message.type(), "onWindowAdded"); const base::DictionaryValue* message_data = nullptr; - scoped_ptr<base::Value> host_message(base::JSONReader::Read(message.data())); + scoped_ptr<base::Value> host_message = base::JSONReader::Read(message.data()); if (!host_message.get() || !host_message->GetAsDictionary(&message_data)) { LOG(ERROR) << "onWindowAdded message received was not valid JSON."; if (run_loop_) { diff --git a/remoting/test/remote_host_info_fetcher.cc b/remoting/test/remote_host_info_fetcher.cc index 2f9e6a2..d1a651a 100644 --- a/remoting/test/remote_host_info_fetcher.cc +++ b/remoting/test/remote_host_info_fetcher.cc @@ -101,7 +101,7 @@ void RemoteHostInfoFetcher::OnURLFetchComplete(const net::URLFetcher* source) { } scoped_ptr<base::Value> response_value( - base::JSONReader::Read(response_string)); + base::JSONReader::DeprecatedRead(response_string)); if (!response_value || !response_value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(ERROR) << "Failed to parse response string to JSON"; |