Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2925)

Unified Diff: base/json/json_string_value_serializer.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/json/json_reader_unittest.cc ('k') | base/json/json_value_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_string_value_serializer.cc
diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc
index debf9f088d1f3acf5a1c588d8ab2759be81969f8..5425c7e7b94391b58f353617372939106863a1e0 100644
--- a/base/json/json_string_value_serializer.cc
+++ b/base/json/json_string_value_serializer.cc
@@ -37,7 +37,7 @@ bool JSONStringValueSerializer::SerializeInternal(const Value& root,
if (pretty_print_)
options |= base::JSONWriter::OPTIONS_PRETTY_PRINT;
- return base::JSONWriter::WriteWithOptions(&root, options, json_string_);
+ return base::JSONWriter::WriteWithOptions(root, options, json_string_);
}
JSONStringValueDeserializer::JSONStringValueDeserializer(
@@ -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);
}
« no previous file with comments | « base/json/json_reader_unittest.cc ('k') | base/json/json_value_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698