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

media/audio/audio_output_controller.cc

Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 1d84638d4a62140ff2a15afab3af5c6e2a891fd9..979de066c4d81aea8005a67ef8859aedd56dea3c 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -129,7 +129,7 @@ void AudioOutputController::SetVolume(double volume) {
 
 void AudioOutputController::EnqueueData(const uint8* data, uint32 size) {
   // Write data to the push source and ask for more data if needed.
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   pending_request_ = false;
   // If |size| is set to 0, it indicates that the audio source doesn't have
   // more data right now, and so it doesn't make sense to send additional
@@ -178,7 +178,7 @@ void AudioOutputController::DoCreate(AudioParameters params) {
 
   // If in normal latency mode then start buffering.
   if (!LowLatencyMode()) {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     SubmitOnMoreData_Locked();
   }
 }
@@ -280,7 +280,7 @@ uint32 AudioOutputController::OnMoreData(
     uint32 max_size, AudioBuffersState buffers_state) {
   // If regular latency mode is used.
   if (!sync_reader_) {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
 
     // Save current buffers state.
     buffers_state_ = buffers_state;
@@ -325,7 +325,7 @@ void AudioOutputController::SubmitOnMoreData_Locked() {
   // If we need more data then call the event handler to ask for more data.
   // It is okay that we don't lock in this block because the parameters are
   // correct and in the worst case we are just asking more data than needed.
-  AutoUnlock auto_unlock(lock_);
+  base::AutoUnlock auto_unlock(lock_);
   handler_->OnMoreData(this, buffers_state);
 }