Remove obsolete base/lock.h and fix up callers to use the new header file and

the base namespace. Fix several files including lock.h unnecessarily.

BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h b/third_party/cacheinvalidation/overrides/google/cacheinvalidation/mutex.h
index b99dcee..4d64f0f 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);
 };