| Index: remoting/host/json_host_config.cc
|
| diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc
|
| index ab639f0291ebaf4800ecb6daffad799ed6dd6604..36b39f2eff284acfb3a7217c4b6d4e265eaa7031 100644
|
| --- a/remoting/host/json_host_config.cc
|
| +++ b/remoting/host/json_host_config.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/message_loop_proxy.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "base/task.h"
|
| #include "base/values.h"
|
|
|
| @@ -35,7 +36,7 @@ bool JsonHostConfig::Read() {
|
| }
|
|
|
| DictionaryValue* dictionary = static_cast<DictionaryValue*>(value.release());
|
| - AutoLock auto_lock(lock_);
|
| + base::AutoLock auto_lock(lock_);
|
| values_.reset(dictionary);
|
| return true;
|
| }
|
| @@ -47,7 +48,7 @@ void JsonHostConfig::Save() {
|
|
|
| void JsonHostConfig::DoWrite() {
|
| std::string file_content;
|
| - AutoLock auto_lock(lock_);
|
| + base::AutoLock auto_lock(lock_);
|
| base::JSONWriter::Write(values_.get(), true, &file_content);
|
| // TODO(sergeyu): Move ImportantFileWriter to base and use it here.
|
| file_util::WriteFile(filename_, file_content.c_str(), file_content.size());
|
|
|