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

media/filters/audio_renderer_base.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.
 
 // AudioRendererBase takes care of the tricky queuing work and provides simple
 // methods for subclasses to peek and poke at audio data.  In addition to
 // AudioRenderer interface methods this classes doesn't implement, subclasses
 // must also implement the following methods:
 //   OnInitialized
 //   OnStop
 //
 // The general assumption is that subclasses start a callback-based audio thread
 // which needs to be filled with decoded audio data.  AudioDecoderBase provides
 // FillBuffer which handles filling the provided buffer, dequeuing items,
 // scheduling additional reads and updating the clock.  In a sense,
 // AudioRendererBase is the producer and the subclass is the consumer.
 
 #ifndef MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_
 
 #include <deque>
 
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/filters/audio_renderer_algorithm_base.h"
 
 namespace media {
 
 class AudioRendererBase : public AudioRenderer {
  public:
   AudioRendererBase();
   virtual ~AudioRendererBase();
@@ skipping 61 matching lines @@
   //
   // Safe to call from any thread.
   void ScheduleRead_Locked();
 
   // Audio decoder.
   scoped_refptr<AudioDecoder> decoder_;
 
   // Algorithm for scaling audio.
   scoped_ptr<AudioRendererAlgorithmBase> algorithm_;
 
-  Lock lock_;
+  base::Lock lock_;
 
   // Simple state tracking variable.
   enum State {
     kUninitialized,
     kPaused,
     kSeeking,
     kPlaying,
     kStopped,
     kError,
   };
@@ skipping 19 matching lines @@
   scoped_ptr<FilterCallback> seek_callback_;
 
   base::TimeDelta seek_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_