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

media/filters/ffmpeg_glue.h

 // Copyright (c) 2009 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.
 
 // FFmpegGlue is an adapter for FFmpeg's URLProtocol interface that allows us to
 // use a DataSource implementation with FFmpeg. For convenience we use FFmpeg's
 // av_open_input_file function, which analyzes the filename given to it and
 // automatically initializes the appropriate URLProtocol.
 //
 // Since the DataSource is already open by time we call av_open_input_file, we
@@ skipping 11 matching lines @@
 // the DataSource as a URLProtocol instance to FFmpeg.  Since FFmpegGlue is only
 // needed for opening files, when av_open_input_file returns FFmpegDemuxer
 // removes the DataSource from FFmpegGlue's map.
 
 #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_
 #define MEDIA_FILTERS_FFMPEG_GLUE_H_
 
 #include <map>
 #include <string>
 
-#include "base/lock.h"
 #include "base/singleton.h"
+#include "base/synchronization/lock.h"
 
 namespace media {
 
 class FFmpegURLProtocol {
  public:
   FFmpegURLProtocol() {
   }
 
   virtual ~FFmpegURLProtocol() {
   }
@@ skipping 42 matching lines @@
   // Only allow Singleton to create and delete FFmpegGlue.
   friend struct DefaultSingletonTraits<FFmpegGlue>;
   FFmpegGlue();
   virtual ~FFmpegGlue();
 
   // Returns the unique key for this data source, which can be passed to
   // av_open_input_file as the filename.
   std::string GetProtocolKey(FFmpegURLProtocol* protocol);
 
   // Mutual exclusion while adding/removing items from the map.
-  Lock lock_;
+  base::Lock lock_;
 
   // Map between keys and FFmpegProtocol references.
   typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
   ProtocolMap protocols_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_GLUE_H_