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

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 todo about not failed trybot 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
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();
« no previous file with comments | « chromeos/tools/onc_validator/onc_validator.cc ('k') | components/bookmarks/browser/bookmark_codec_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698