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

media/audio/linux/alsa_output.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.
 //
 // Creates an output stream based on the ALSA PCM interface.
 //
 // On device write failure, the stream will move itself to an invalid state.
 // No more data will be pulled from the data source, or written to the device.
 // All calls to public API functions will either no-op themselves, or return an
 // error if possible.  Specifically, If the stream is in an error state, Open()
@@ skipping 22 matching lines @@
 // ScopedRunnableMethodFactory to create tasks.
 
 #ifndef MEDIA_AUDIO_LINUX_ALSA_OUTPUT_H_
 #define MEDIA_AUDIO_LINUX_ALSA_OUTPUT_H_
 
 #include <alsa/asoundlib.h>
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
 namespace media {
 class SeekableBuffer;
 };  // namespace media
 
 class AlsaWrapper;
 class AudioManagerLinux;
 class MessageLoop;
@@ skipping 130 matching lines @@
     // using a deleted callback.
     uint32 OnMoreData(AudioOutputStream* stream, uint8* dest,
                       uint32 max_size, AudioBuffersState buffers_state);
     void OnError(AudioOutputStream* stream, int code);
 
     // Changes the AudioSourceCallback to proxy calls to.  Pass in NULL to
     // release ownership of the currently registered callback.
     void set_source_callback(AudioSourceCallback* callback);
 
    private:
-    Lock lock_;
+    base::Lock lock_;
 
     InternalState state_;
     float volume_;  // Volume level from 0.0 to 1.0.
 
     AudioSourceCallback* source_callback_;
 
     MessageLoop* const state_transition_loop_;
 
     DISALLOW_COPY_AND_ASSIGN(SharedData);
   } shared_data_;
@@ skipping 39 matching lines @@
   MessageLoop* client_thread_loop_;
 
   // The message loop responsible for querying the data source, and writing to
   // the output device.
   MessageLoop* message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AlsaPcmOutputStream);
 };
 
 #endif  // MEDIA_AUDIO_LINUX_ALSA_OUTPUT_H_