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

webkit/glue/webmediaplayer_impl.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 "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
       outstanding_repaints_(0) {
   DCHECK(render_loop_);
   DCHECK(webmediaplayer_);
 }
 
 WebMediaPlayerImpl::Proxy::~Proxy() {
   Detach();
 }
 
 void WebMediaPlayerImpl::Proxy::Repaint() {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   if (outstanding_repaints_ < kMaxOutstandingRepaints) {
     ++outstanding_repaints_;
 
     render_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(this, &WebMediaPlayerImpl::Proxy::RepaintTask));
   }
 }
 
 void WebMediaPlayerImpl::Proxy::SetVideoRenderer(
     scoped_refptr<WebVideoRenderer> video_renderer) {
@@ skipping 63 matching lines @@
 }
 
 void WebMediaPlayerImpl::Proxy::NetworkEventCallback() {
   render_loop_->PostTask(FROM_HERE, NewRunnableMethod(this,
       &WebMediaPlayerImpl::Proxy::NetworkEventTask));
 }
 
 void WebMediaPlayerImpl::Proxy::RepaintTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     --outstanding_repaints_;
     DCHECK_GE(outstanding_repaints_, 0);
   }
   if (webmediaplayer_) {
     webmediaplayer_->Repaint();
   }
 }
 
 void WebMediaPlayerImpl::Proxy::PipelineInitializationTask() {
   DCHECK(MessageLoop::current() == render_loop_);
@@ skipping 631 matching lines @@
   pipeline_stopped_.Signal();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue