OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "remoting/host/host_config.h" | 5 #include "remoting/host/host_config.h" |
6 | 6 |
7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
8 #include "base/files/important_file_writer.h" | 8 #include "base/files/important_file_writer.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 | 12 |
13 namespace remoting { | 13 namespace remoting { |
14 | 14 |
15 scoped_ptr<base::DictionaryValue> HostConfigFromJson( | 15 scoped_ptr<base::DictionaryValue> HostConfigFromJson( |
16 const std::string& json) { | 16 const std::string& json) { |
17 scoped_ptr<base::Value> value = | 17 scoped_ptr<base::Value> value = |
18 base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS); | 18 base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS); |
19 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { | 19 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { |
20 LOG(WARNING) << "Failed to parse host config from JSON"; | 20 LOG(WARNING) << "Failed to parse host config from JSON"; |
21 return nullptr; | 21 return nullptr; |
22 } | 22 } |
23 | 23 |
24 scoped_ptr<base::DictionaryValue> config( | 24 return make_scoped_ptr(static_cast<base::DictionaryValue*>(value.release())); |
25 static_cast<base::DictionaryValue*>(value.release())); | |
26 return config.Pass(); | |
27 } | 25 } |
28 | 26 |
29 std::string HostConfigToJson(const base::DictionaryValue& host_config) { | 27 std::string HostConfigToJson(const base::DictionaryValue& host_config) { |
30 std::string data; | 28 std::string data; |
31 base::JSONWriter::Write(host_config, &data); | 29 base::JSONWriter::Write(host_config, &data); |
32 return data; | 30 return data; |
33 } | 31 } |
34 | 32 |
35 scoped_ptr<base::DictionaryValue> HostConfigFromJsonFile( | 33 scoped_ptr<base::DictionaryValue> HostConfigFromJsonFile( |
36 const base::FilePath& config_file) { | 34 const base::FilePath& config_file) { |
37 // TODO(sergeyu): Implement better error handling here. | 35 // TODO(sergeyu): Implement better error handling here. |
38 std::string serialized; | 36 std::string serialized; |
39 if (!base::ReadFileToString(config_file, &serialized)) { | 37 if (!base::ReadFileToString(config_file, &serialized)) { |
40 LOG(WARNING) << "Failed to read " << config_file.value(); | 38 LOG(WARNING) << "Failed to read " << config_file.value(); |
41 return nullptr; | 39 return nullptr; |
42 } | 40 } |
43 | 41 |
44 return HostConfigFromJson(serialized); | 42 return HostConfigFromJson(serialized); |
45 } | 43 } |
46 | 44 |
47 bool HostConfigToJsonFile(const base::DictionaryValue& host_config, | 45 bool HostConfigToJsonFile(const base::DictionaryValue& host_config, |
48 const base::FilePath& config_file) { | 46 const base::FilePath& config_file) { |
49 std::string serialized = HostConfigToJson(host_config); | 47 std::string serialized = HostConfigToJson(host_config); |
50 return base::ImportantFileWriter::WriteFileAtomically(config_file, | 48 return base::ImportantFileWriter::WriteFileAtomically(config_file, |
51 serialized); | 49 serialized); |
52 } | 50 } |
53 | 51 |
54 } // namespace remoting | 52 } // namespace remoting |
OLD | NEW |