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, 4 insertions, 4 deletions

diff --git a/tools/memory_watcher/memory_watcher.cc b/tools/memory_watcher/memory_watcher.cc
index 5ff8dae..29053f0 100644
--- a/tools/memory_watcher/memory_watcher.cc
+++ b/tools/memory_watcher/memory_watcher.cc
@@ -8,10 +8,10 @@
 
 #include "tools/memory_watcher/memory_watcher.h"
 #include "base/file_util.h"
-#include "base/lock.h"
 #include "base/logging.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
+#include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "tools/memory_watcher/call_stack.h"
 #include "tools/memory_watcher/preamble_patcher.h"
@@ -107,7 +107,7 @@ void MemoryWatcher::OnTrack(HANDLE heap, int32 id, int32 size) {
   if (!stack->Valid()) return;  // Recursion blocked generation of stack.
 
   {
-    AutoLock lock(block_map_lock_);
+    base::AutoLock lock(block_map_lock_);
 
     // Ideally, we'd like to verify that the block being added
     // here is not already in our list of tracked blocks.  However,
@@ -151,7 +151,7 @@ void MemoryWatcher::OnUntrack(HANDLE heap, int32 id, int32 size) {
     return;
 
   {
-    AutoLock lock(block_map_lock_);
+    base::AutoLock lock(block_map_lock_);
     active_thread_id_ = GetCurrentThreadId();
 
     // First, find the block in our block_map.
@@ -197,7 +197,7 @@ void MemoryWatcher::DumpLeaks() {
     return;
   Unhook();
 
-  AutoLock lock(block_map_lock_);
+  base::AutoLock lock(block_map_lock_);
   active_thread_id_ = GetCurrentThreadId();
 
   OpenLogFile();