Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(913)

Unified Diff: remoting/host/json_host_config.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/json_host_config.h ('k') | remoting/jingle_glue/jingle_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « remoting/host/json_host_config.h ('k') | remoting/jingle_glue/jingle_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698