Index: 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 284a166be1a1df804d90efc57f304175be9a33c8..48cc9166e5cee5e37867c0052d34f902251e2a90 100644 |
--- a/chrome/browser/speech/speech_input_manager.cc |
+++ b/chrome/browser/speech/speech_input_manager.cc |
@@ -9,8 +9,8 @@ |
#include "app/l10n_util.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_thread.h" |
@@ -60,19 +60,19 @@ class HardwareInfo : public base::RefCountedThreadSafe<HardwareInfo> { |
void GetHardwareInfo() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
- AutoLock lock(lock_); |
+ base::AutoLock lock(lock_); |
value_ = UTF16ToUTF8( |
installer::WMIComputerSystem::GetModel() + L"|" + |
AudioManager::GetAudioManager()->GetAudioInputDeviceModel()); |
} |
std::string value() { |
- AutoLock lock(lock_); |
+ base::AutoLock lock(lock_); |
return value_; |
} |
private: |
- Lock lock_; |
+ base::Lock lock_; |
std::string value_; |
#else // defined(OS_WIN) |