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

ipc/ipc_channel_proxy.cc

 // Copyright (c) 2006-2008 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/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_logging.h"
@@ skipping 177 matching lines @@
     return;
   }
   if (!channel_->Send(message))
     OnChannelError();
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnAddFilter() {
   std::vector<scoped_refptr<MessageFilter> > filters;
   {
-    AutoLock auto_lock(pending_filters_lock_);
+    base::AutoLock auto_lock(pending_filters_lock_);
     filters.swap(pending_filters_);
   }
 
   for (size_t i = 0; i < filters.size(); ++i) {
     filters_.push_back(filters[i]);
 
     // If the channel has already been created, then we need to send this
     // message so that the filter gets access to the Channel.
     if (channel_.get())
       filters[i]->OnFilterAdded(channel_.get());
@@ skipping 11 matching lines @@
       filters_.erase(filters_.begin() + i);
       return;
     }
   }
 
   NOTREACHED() << "filter to be removed not found";
 }
 
 // Called on the listener's thread
 void ChannelProxy::Context::AddFilter(MessageFilter* filter) {
-  AutoLock auto_lock(pending_filters_lock_);
+  base::AutoLock auto_lock(pending_filters_lock_);
   pending_filters_.push_back(make_scoped_refptr(filter));
   ipc_message_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &Context::OnAddFilter));
 }
 
 // Called on the listener's thread
 void ChannelProxy::Context::OnDispatchMessage(const Message& message) {
   if (!listener_)
     return;
@@ skipping 133 matching lines @@
   Channel *channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->GetClientFileDescriptor();
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC