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

media/audio/audio_input_controller.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 "media/audio/audio_input_controller.h"
 
 #include "base/threading/thread_restrictions.h"
 #include "media/base/limits.h"
 
 namespace {
@@ skipping 92 matching lines @@
   handler_->OnCreated(this);
 }
 
 void AudioInputController::DoRecord() {
   DCHECK_EQ(thread_.message_loop(), MessageLoop::current());
 
   if (state_ != kCreated)
     return;
 
   {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     state_ = kRecording;
   }
 
   stream_->Start(this);
   handler_->OnRecording(this);
 }
 
 void AudioInputController::DoClose() {
   DCHECK_EQ(thread_.message_loop(), MessageLoop::current());
   DCHECK_NE(kClosed, state_);
@@ skipping 12 matching lines @@
 }
 
 void AudioInputController::DoReportError(int code) {
   DCHECK_EQ(thread_.message_loop(), MessageLoop::current());
   handler_->OnError(this, code);
 }
 
 void AudioInputController::OnData(AudioInputStream* stream, const uint8* data,
                                   uint32 size) {
   {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     if (state_ != kRecording)
       return;
   }
   handler_->OnData(this, data, size);
 }
 
 void AudioInputController::OnClose(AudioInputStream* stream) {
   // TODO(satish): Sometimes the device driver closes the input stream without
   // us asking for it (may be if the device was unplugged?). Check how to handle
   // such cases here.
 }
 
 void AudioInputController::OnError(AudioInputStream* stream, int code) {
   // Handle error on the audio controller thread.
   thread_.message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &AudioInputController::DoReportError, code));
 }
 
 }  // namespace media