summaryrefslogtreecommitdiffstats
path: root/chromecast/base/serializers.cc
diff options
context:
space:
mode:
authorolli.raula <olli.raula@intel.com>2015-10-15 23:16:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-16 06:17:31 +0000
commitba04525cccccae530aa899882227d81b037eebff (patch)
tree311a935c17622cd982a5ee637005c3836c2ae84a /chromecast/base/serializers.cc
parent1737f9e86e74990aad0e9693ebf247c8ffbb86f9 (diff)
downloadchromium_src-ba04525cccccae530aa899882227d81b037eebff.zip
chromium_src-ba04525cccccae530aa899882227d81b037eebff.tar.gz
chromium_src-ba04525cccccae530aa899882227d81b037eebff.tar.bz2
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}
Diffstat (limited to 'chromecast/base/serializers.cc')
-rw-r--r--chromecast/base/serializers.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chromecast/base/serializers.cc b/chromecast/base/serializers.cc
index 34bc9fd..2e6135b 100644
--- a/chromecast/base/serializers.cc
+++ b/chromecast/base/serializers.cc
@@ -15,8 +15,8 @@ scoped_ptr<base::Value> DeserializeFromJson(const std::string& text) {
int error_code = -1;
std::string error_msg;
- scoped_ptr<base::Value> value(
- deserializer.Deserialize(&error_code, &error_msg));
+ scoped_ptr<base::Value> value =
+ deserializer.Deserialize(&error_code, &error_msg);
DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
// Value will hold the nullptr in case of an error.
@@ -36,8 +36,8 @@ scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path) {
int error_code = -1;
std::string error_msg;
- scoped_ptr<base::Value> value(
- deserializer.Deserialize(&error_code, &error_msg));
+ scoped_ptr<base::Value> value =
+ deserializer.Deserialize(&error_code, &error_msg);
DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
// Value will hold the nullptr in case of an error.