From 20305ec6f1acf21392c2f3938a14a96f1e28e76d Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 21 Jan 2011 04:55:52 +0000 Subject: Remove obsolete base/lock.h and fix up callers to use the new header file and the base namespace. Fix several files including lock.h unnecessarily. BUG=none TEST=none Original review=http://codereview.chromium.org/6142009/ Patch by leviw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/speech/speech_input_manager.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/speech/speech_input_manager.cc') diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc index 56a87c9..4cdc608 100644 --- a/chrome/browser/speech/speech_input_manager.cc +++ b/chrome/browser/speech/speech_input_manager.cc @@ -10,8 +10,8 @@ #include "app/l10n_util.h" #include "base/command_line.h" #include "base/lazy_instance.h" -#include "base/lock.h" #include "base/ref_counted.h" +#include "base/synchronization/lock.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -62,7 +62,7 @@ class OptionalRequestInfo void GetHardwareInfo() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); - AutoLock lock(lock_); + base::AutoLock lock(lock_); can_report_metrics_ = true; #if defined(OS_WIN) value_ = UTF16ToUTF8( @@ -75,17 +75,17 @@ class OptionalRequestInfo } std::string value() { - AutoLock lock(lock_); + base::AutoLock lock(lock_); return value_; } bool can_report_metrics() { - AutoLock lock(lock_); + base::AutoLock lock(lock_); return can_report_metrics_; } private: - Lock lock_; + base::Lock lock_; std::string value_; bool can_report_metrics_; -- cgit v1.1