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

media/audio/audio_output_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_OUTPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/simple_sources.h"
 
 class MessageLoop;
 class Task;
 
 // An AudioOutputController controls an AudioOutputStream and provides data
@@ skipping 159 matching lines @@
   double volume_;
 
   // |state_| is written on the audio 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 controller thread.
   State state_;
 
   AudioBuffersState buffers_state_;
 
   // The |lock_| must be acquired whenever we access |buffer_|.
-  Lock lock_;
+  base::Lock lock_;
 
   media::SeekableBuffer buffer_;
 
   bool pending_request_;
 
   // SyncReader is used only in low latency mode for synchronous reading.
   SyncReader* sync_reader_;
 
   // The message loop of audio thread that this object runs on.
   MessageLoop* message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputController);
 };
 
 }  // namespace media
 
 #endif  //  MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_