base/json/json_string_value_serializer.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/json/json_string_value_serializer.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add ::From Created 5 years, 2 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_string_value_serializer.h ('k') | base/json/json_value_serializer_unittest.cc » ('j') | chrome/browser/chromeos/app_mode/kiosk_external_updater.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 f2d078f30eed712d5bca57d6971bd3bb1dfd34a7..af7e010a3ab3343c070c6246cc1fff0646dea9e0 100644

--- a/base/json/json_string_value_serializer.cc

+++ b/base/json/json_string_value_serializer.cc

@@ -48,12 +48,11 @@ JSONStringValueDeserializer::JSONStringValueDeserializer(

JSONStringValueDeserializer::~JSONStringValueDeserializer() {}

-Value* JSONStringValueDeserializer::Deserialize(int* error_code,

- std::string* error_str) {

+scoped_ptr<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,

- error_code, error_str)

- .release();

+ json_string_, allow_trailing_comma_ ? base::JSON_ALLOW_TRAILING_COMMAS

+ : base::JSON_PARSE_RFC,

+ error_code, error_str);

}