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

media/filters/ffmpeg_glue.cc

Index: media/filters/ffmpeg_glue.cc
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index 663fff73eaa83cbc4f180f8a443899e203108ac2..fede662b77d171fa7c8bd5cd51349674f809fcfe 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -88,21 +88,21 @@ int CloseContext(URLContext* h) {
 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;
   }
@@ -151,7 +151,7 @@ FFmpegGlue* FFmpegGlue::GetInstance() {
 }
 
 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;
@@ -160,7 +160,7 @@ std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
 }
 
 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;
@@ -173,7 +173,7 @@ void FFmpegGlue::RemoveProtocol(FFmpegURLProtocol* protocol) {
 
 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;