| Index: chromecast/base/serializers.cc
|
| diff --git a/chromecast/base/serializers.cc b/chromecast/base/serializers.cc
|
| index 2e6135bb17fdc4b7cce15227d38c3d99e3ac5874..87e9dc51cef477a7f7b4fe626ccb246e6e4dbccd 100644
|
| --- a/chromecast/base/serializers.cc
|
| +++ b/chromecast/base/serializers.cc
|
| @@ -20,7 +20,7 @@ scoped_ptr<base::Value> DeserializeFromJson(const std::string& text) {
|
| DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
|
|
|
| // Value will hold the nullptr in case of an error.
|
| - return value.Pass();
|
| + return value;
|
| }
|
|
|
| scoped_ptr<std::string> SerializeToJson(const base::Value& value) {
|
| @@ -28,7 +28,7 @@ scoped_ptr<std::string> SerializeToJson(const base::Value& value) {
|
| JSONStringValueSerializer serializer(json_str.get());
|
| if (!serializer.Serialize(value))
|
| json_str.reset(nullptr);
|
| - return json_str.Pass();
|
| + return json_str;
|
| }
|
|
|
| scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path) {
|
| @@ -41,7 +41,7 @@ scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path) {
|
| DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
|
|
|
| // Value will hold the nullptr in case of an error.
|
| - return value.Pass();
|
| + return value;
|
| }
|
|
|
| bool SerializeJsonToFile(const base::FilePath& path, const base::Value& value) {
|
|
|