| 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/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 | 13 |
| 14 namespace remoting { | 14 namespace remoting { |
| 15 | 15 |
| 16 std::unique_ptr<base::DictionaryValue> HostConfigFromJson( | 16 std::unique_ptr<base::DictionaryValue> HostConfigFromJson( |
| 17 const std::string& json) { | 17 const std::string& json) { |
| 18 std::unique_ptr<base::Value> value = | 18 std::unique_ptr<base::Value> value = |
| 19 base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS); | 19 base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS); |
| 20 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) { | 20 if (!value || !value->IsType(base::Value::Type::DICTIONARY)) { |
| 21 LOG(WARNING) << "Failed to parse host config from JSON"; | 21 LOG(WARNING) << "Failed to parse host config from JSON"; |
| 22 return nullptr; | 22 return nullptr; |
| 23 } | 23 } |
| 24 | 24 |
| 25 return base::WrapUnique(static_cast<base::DictionaryValue*>(value.release())); | 25 return base::WrapUnique(static_cast<base::DictionaryValue*>(value.release())); |
| 26 } | 26 } |
| 27 | 27 |
| 28 std::string HostConfigToJson(const base::DictionaryValue& host_config) { | 28 std::string HostConfigToJson(const base::DictionaryValue& host_config) { |
| 29 std::string data; | 29 std::string data; |
| 30 base::JSONWriter::Write(host_config, &data); | 30 base::JSONWriter::Write(host_config, &data); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 44 } | 44 } |
| 45 | 45 |
| 46 bool HostConfigToJsonFile(const base::DictionaryValue& host_config, | 46 bool HostConfigToJsonFile(const base::DictionaryValue& host_config, |
| 47 const base::FilePath& config_file) { | 47 const base::FilePath& config_file) { |
| 48 std::string serialized = HostConfigToJson(host_config); | 48 std::string serialized = HostConfigToJson(host_config); |
| 49 return base::ImportantFileWriter::WriteFileAtomically(config_file, | 49 return base::ImportantFileWriter::WriteFileAtomically(config_file, |
| 50 serialized); | 50 serialized); |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace remoting | 53 } // namespace remoting |
| OLD | NEW |