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

media/filters/ffmpeg_glue.cc

 // 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.
 
 #include "base/string_util.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace {
@@ skipping 70 matching lines @@
 }
 
 int CloseContext(URLContext* h) {
   h->priv_data = NULL;
   return 0;
 }
 
 int LockManagerOperation(void** lock, enum AVLockOp op) {
   switch (op) {
     case AV_LOCK_CREATE:
-      *lock = new Lock();
+      *lock = new base::Lock();
       if (!*lock)
         return 1;
       return 0;
 
     case AV_LOCK_OBTAIN:
-      static_cast<Lock*>(*lock)->Acquire();
+      static_cast<base::Lock*>(*lock)->Acquire();
       return 0;
 
     case AV_LOCK_RELEASE:
-      static_cast<Lock*>(*lock)->Release();
+      static_cast<base::Lock*>(*lock)->Release();
       return 0;
 
     case AV_LOCK_DESTROY:
-      delete static_cast<Lock*>(*lock);
+      delete static_cast<base::Lock*>(*lock);
       *lock = NULL;
       return 0;
   }
   return 1;
 }
 
 }  // namespace
 
 //------------------------------------------------------------------------------
 
@@ skipping 28 matching lines @@
 FFmpegGlue::~FFmpegGlue() {
   av_lockmgr_register(NULL);
 }
 
 // static
 FFmpegGlue* FFmpegGlue::GetInstance() {
   return Singleton<FFmpegGlue>::get();
 }
 
 std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   std::string key = GetProtocolKey(protocol);
   if (protocols_.find(key) == protocols_.end()) {
     protocols_[key] = protocol;
   }
   return key;
 }
 
 void FFmpegGlue::RemoveProtocol(FFmpegURLProtocol* protocol) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   for (ProtocolMap::iterator cur, iter = protocols_.begin();
        iter != protocols_.end();) {
     cur = iter;
     iter++;
 
     if (cur->second == protocol)
       protocols_.erase(cur);
   }
 }
 
 void FFmpegGlue::GetProtocol(const std::string& key,
                              FFmpegURLProtocol** protocol) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   ProtocolMap::iterator iter = protocols_.find(key);
   if (iter == protocols_.end()) {
     *protocol = NULL;
     return;
   }
   *protocol = iter->second;
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media