| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROMECAST_BASE_SERIALIZERS_H_ | 5 #ifndef CHROMECAST_BASE_SERIALIZERS_H_ |
| 6 #define CHROMECAST_BASE_SERIALIZERS_H_ | 6 #define CHROMECAST_BASE_SERIALIZERS_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 | 11 |
| 12 namespace base { | 12 namespace base { |
| 13 class Value; | 13 class Value; |
| 14 class FilePath; | 14 class FilePath; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace chromecast { | 17 namespace chromecast { |
| 18 | 18 |
| 19 // Helper function which deserializes JSON |text| into a base::Value. If |text| | 19 // Helper function which deserializes JSON |text| into a base::Value. If |text| |
| 20 // is empty, is not valid JSON, or if some other deserialization error occurs, | 20 // is empty, is not valid JSON, or if some other deserialization error occurs, |
| 21 // the return value will hold the NULL pointer. | 21 // the return value will hold the NULL pointer. |
| 22 scoped_ptr<base::Value> DeserializeFromJson(const std::string& text); | 22 std::unique_ptr<base::Value> DeserializeFromJson(const std::string& text); |
| 23 | 23 |
| 24 // Helper function which serializes |value| into a JSON string. If a | 24 // Helper function which serializes |value| into a JSON string. If a |
| 25 // serialization error occurs,the return value will hold the NULL pointer. | 25 // serialization error occurs,the return value will hold the NULL pointer. |
| 26 scoped_ptr<std::string> SerializeToJson(const base::Value& value); | 26 std::unique_ptr<std::string> SerializeToJson(const base::Value& value); |
| 27 | 27 |
| 28 // Helper function which deserializes JSON file at |path| into a base::Value. | 28 // Helper function which deserializes JSON file at |path| into a base::Value. |
| 29 // If file in |path| is empty, is not valid JSON, or if some other | 29 // If file in |path| is empty, is not valid JSON, or if some other |
| 30 // deserialization error occurs, the return value will hold the NULL pointer. | 30 // deserialization error occurs, the return value will hold the NULL pointer. |
| 31 scoped_ptr<base::Value> DeserializeJsonFromFile(const base::FilePath& path); | 31 std::unique_ptr<base::Value> DeserializeJsonFromFile( |
| 32 const base::FilePath& path); |
| 32 | 33 |
| 33 // Helper function which serializes |value| into the file at |path|. The | 34 // Helper function which serializes |value| into the file at |path|. The |
| 34 // function returns true on success, false otherwise. | 35 // function returns true on success, false otherwise. |
| 35 bool SerializeJsonToFile(const base::FilePath& path, const base::Value& value); | 36 bool SerializeJsonToFile(const base::FilePath& path, const base::Value& value); |
| 36 | 37 |
| 37 } // namespace chromecast | 38 } // namespace chromecast |
| 38 | 39 |
| 39 #endif // CHROMECAST_BASE_SERIALIZERS_H_ | 40 #endif // CHROMECAST_BASE_SERIALIZERS_H_ |
| OLD | NEW |