From ba04525cccccae530aa899882227d81b037eebff Mon Sep 17 00:00:00 2001 From: "olli.raula" Date: Thu, 15 Oct 2015 23:16:40 -0700 Subject: Make ValueDeserializer::Deserialize return scoped_ptr Make ValueDeserializer::Deserialize return scoped_ptr as almost all consumers already use scoped_ptr and it is also better way to do it. TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1394993004 Cr-Commit-Position: refs/heads/master@{#354458} --- extensions/utility/unpacker.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/utility') diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index 6e28a49b..f499808 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -121,7 +121,7 @@ scoped_ptr Unpacker::ReadManifest() { JSONFileValueDeserializer deserializer(manifest_path); std::string error; - scoped_ptr root(deserializer.Deserialize(NULL, &error)); + scoped_ptr root = deserializer.Deserialize(NULL, &error); if (!root.get()) { SetError(error); return NULL; @@ -253,8 +253,8 @@ bool Unpacker::AddDecodedImage(const base::FilePath& path) { bool Unpacker::ReadMessageCatalog(const base::FilePath& message_path) { std::string error; JSONFileValueDeserializer deserializer(message_path); - scoped_ptr root = base::DictionaryValue::From( - make_scoped_ptr(deserializer.Deserialize(NULL, &error))); + scoped_ptr root = + base::DictionaryValue::From(deserializer.Deserialize(NULL, &error)); if (!root.get()) { base::string16 messages_file = message_path.LossyDisplayName(); if (error.empty()) { -- cgit v1.1