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

ipc/ipc_channel_proxy.h

Index: ipc/ipc_channel_proxy.h
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 82a243b015e9200fda96226362a8e77d27b6ebae..86838916ac0874c38f0c6b3e94f9d7e5015e8f49 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_handle.h"
 
@@ -229,7 +229,7 @@ class ChannelProxy : public Message::Sender {
     // IPC thread when they're added to filters_.
     std::vector<scoped_refptr<MessageFilter> > pending_filters_;
     // Lock for pending_filters_.
-    Lock pending_filters_lock_;
+    base::Lock pending_filters_lock_;
   };
 
   Context* context() { return context_; }