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

Unified Diff: chromecast/base/serializers.cc

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « chromecast/base/serializers.h ('k') | chromecast/base/serializers_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/base/serializers.cc
diff --git a/chromecast/base/serializers.cc b/chromecast/base/serializers.cc
index 87e9dc51cef477a7f7b4fe626ccb246e6e4dbccd..7041a961de818dd1ed91571586da7441bccc5ecb 100644
--- a/chromecast/base/serializers.cc
+++ b/chromecast/base/serializers.cc
@@ -10,12 +10,12 @@
namespace chromecast {
-scoped_ptr<base::Value> DeserializeFromJson(const std::string& text) {
+std::unique_ptr<base::Value> DeserializeFromJson(const std::string& text) {
JSONStringValueDeserializer deserializer(text);
int error_code = -1;
std::string error_msg;
- scoped_ptr<base::Value> value =
+ std::unique_ptr<base::Value> value =
deserializer.Deserialize(&error_code, &error_msg);
DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
@@ -23,20 +23,21 @@ scoped_ptr<base::Value> DeserializeFromJson(const std::string& text) {
return value;
}
-scoped_ptr<std::string> SerializeToJson(const base::Value& value) {
- scoped_ptr<std::string> json_str(new std::string());
+std::unique_ptr<std::string> SerializeToJson(const base::Value& value) {
+ std::unique_ptr<std::string> json_str(new std::string());
JSONStringValueSerializer serializer(json_str.get());
if (!serializer.Serialize(value))
json_str.reset(nullptr);
return json_str;
}
-scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path) {
+std::unique_ptr<base::Value> DeserializeJsonFromFile(
+ const base::FilePath& path) {
JSONFileValueDeserializer deserializer(path);
int error_code = -1;
std::string error_msg;
- scoped_ptr<base::Value> value =
+ std::unique_ptr<base::Value> value =
deserializer.Deserialize(&error_code, &error_msg);
DLOG_IF(ERROR, !value) << "JSON error " << error_code << ":" << error_msg;
« no previous file with comments | « chromecast/base/serializers.h ('k') | chromecast/base/serializers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698