Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

chrome/browser/speech/speech_input_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/speech/speech_input_manager.h"
 
 #include <map>
 #include <string>
 
 #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"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/speech/speech_input_bubble_controller.h"
 #include "chrome/browser/speech/speech_recognizer.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 29 matching lines @@
     if (g_browser_process->local_state()->GetBoolean(
         prefs::kMetricsReportingEnabled)) {
       // Access potentially slow OS calls from the FILE thread.
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(this, &HardwareInfo::GetHardwareInfo));
     }
   }
 
   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)
   void Refresh() {}
   std::string value() { return std::string(); }
 #endif  // defined(OS_WIN)
 
   DISALLOW_COPY_AND_ASSIGN(HardwareInfo);
 };
 
@@ skipping 247 matching lines @@
     // to the user, abort it since user has switched focus. Otherwise
     // recognition has started and keep that going so user can start speaking to
     // another element while this gets the results in parallel.
     if (recording_caller_id_ == caller_id || !requests_[caller_id].is_active) {
       CancelRecognitionAndInformDelegate(caller_id);
     }
   }
 }
 
 }  // namespace speech_input