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

media/audio/audio_input_controller.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 
 // An AudioInputController controls an AudioInputStream and records data
 // from this input stream. It has an important function that it executes
 // audio operations like record, pause, stop, etc. on a separate thread.
 //
 // All the public methods of AudioInputController are non-blocking except
 // close, the actual operations are performed on the audio input controller
@@ skipping 93 matching lines @@
   void DoReportError(int code);
 
   EventHandler* handler_;
   AudioInputStream* stream_;
 
   // |state_| is written on the audio input controller thread and is read on
   // the hardware audio thread. These operations need to be locked. But lock
   // is not required for reading on the audio input controller thread.
   State state_;
 
-  Lock lock_;
+  base::Lock lock_;
 
   // The audio input controller thread that this object runs on.
   base::Thread thread_;
 
   static Factory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  //  MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_