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

third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h

Index: third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h
diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h
index b99dcee0b3d634bf376178e8d52a2427cca8e2bf..4d64f0fa2873c0673d35e435a2ac60a2570bd814 100644
--- a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h
+++ b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h
@@ -5,19 +5,19 @@
 #ifndef GOOGLE_CACHEINVALIDATION_MUTEX_H_
 #define GOOGLE_CACHEINVALIDATION_MUTEX_H_
 
-#include "base/lock.h"
 #include "base/logging.h"
+#include "base/synchronization/lock.h"
 
 namespace invalidation {
 
-typedef ::Lock Mutex;
+typedef base::Lock Mutex;
 
 class MutexLock {
  public:
   explicit MutexLock(Mutex* m) : auto_lock_(*m) {}
 
  private:
-  AutoLock auto_lock_;
+  base::AutoLock auto_lock_;
   DISALLOW_COPY_AND_ASSIGN(MutexLock);
 };