| Index: chromecast/base/serializers.h
|
| diff --git a/chromecast/base/serializers.h b/chromecast/base/serializers.h
|
| index 06c79b760672add766c76e99ed337b10d28a16b5..df648feed65f7b071acef40dcbfb6acec452e7e2 100644
|
| --- a/chromecast/base/serializers.h
|
| +++ b/chromecast/base/serializers.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CHROMECAST_BASE_SERIALIZERS_H_
|
| #define CHROMECAST_BASE_SERIALIZERS_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace base {
|
| class Value;
|
| @@ -19,16 +19,17 @@ namespace chromecast {
|
| // Helper function which deserializes JSON |text| into a base::Value. If |text|
|
| // is empty, is not valid JSON, or if some other deserialization error occurs,
|
| // the return value will hold the NULL pointer.
|
| -scoped_ptr<base::Value> DeserializeFromJson(const std::string& text);
|
| +std::unique_ptr<base::Value> DeserializeFromJson(const std::string& text);
|
|
|
| // Helper function which serializes |value| into a JSON string. If a
|
| // serialization error occurs,the return value will hold the NULL pointer.
|
| -scoped_ptr<std::string> SerializeToJson(const base::Value& value);
|
| +std::unique_ptr<std::string> SerializeToJson(const base::Value& value);
|
|
|
| // Helper function which deserializes JSON file at |path| into a base::Value.
|
| // If file in |path| is empty, is not valid JSON, or if some other
|
| // deserialization error occurs, the return value will hold the NULL pointer.
|
| -scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path);
|
| +std::unique_ptr<base::Value> DeserializeJsonFromFile(
|
| + const base::FilePath& path);
|
|
|
| // Helper function which serializes |value| into the file at |path|. The
|
| // function returns true on success, false otherwise.
|
|
|