components/bookmarks/browser/bookmark_codec.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: components/bookmarks/browser/bookmark_codec.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

« chromeos/tools/onc_validator/onc_validator.cc ('K') | « chromeos/tools/onc_validator/onc_validator.cc ('k') | components/bookmarks/browser/bookmark_codec_unittest.cc » ('j') | extensions/browser/extension_icon_image_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bookmarks/browser/bookmark_codec.cc

diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc

index 52f1a942bab3be9ff0190c788e253c6d625b2058..4d997d6a08a31c4b56eecd05421e17ba326350f7 100644

--- a/components/bookmarks/browser/bookmark_codec.cc

+++ b/components/bookmarks/browser/bookmark_codec.cc

@@ -387,7 +387,7 @@ bool BookmarkCodec::DecodeMetaInfo(const base::DictionaryValue& value,

std::string meta_info_str;

meta_info->GetAsString(&meta_info_str);

JSONStringValueDeserializer deserializer(meta_info_str);

- deserialized_holder.reset(deserializer.Deserialize(nullptr, nullptr));

+ deserialized_holder = deserializer.Deserialize(nullptr, nullptr);

if (!deserialized_holder)

return false;

meta_info = deserialized_holder.get();