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/chrome_frame/sync_msg_reply_dispatcher.cc b/chrome_frame/sync_msg_reply_dispatcher.cc
index a59ba68..e2f1974 100644
--- a/chrome_frame/sync_msg_reply_dispatcher.cc
+++ b/chrome_frame/sync_msg_reply_dispatcher.cc
@@ -14,7 +14,7 @@ void SyncMessageReplyDispatcher::Push(IPC::SyncMessage* msg,
     context->id_ = IPC::SyncMessage::GetMessageId(*msg);
     context->key_ = key;
 
-    AutoLock lock(message_queue_lock_);
+    base::AutoLock lock(message_queue_lock_);
     message_queue_.push_back(context);
   }
 }
@@ -36,7 +36,7 @@ bool SyncMessageReplyDispatcher::OnMessageReceived(const IPC::Message& msg) {
 
 void SyncMessageReplyDispatcher::Cancel(void* key) {
   DCHECK(key != NULL);
-  AutoLock lock(message_queue_lock_);
+  base::AutoLock lock(message_queue_lock_);
   PendingSyncMessageQueue::iterator it = message_queue_.begin();
   while (it != message_queue_.end()) {
     SyncMessageCallContext* context = *it;
@@ -55,7 +55,7 @@ SyncMessageReplyDispatcher::SyncMessageCallContext*
     return NULL;
 
   int id = IPC::SyncMessage::GetMessageId(msg);
-  AutoLock lock(message_queue_lock_);
+  base::AutoLock lock(message_queue_lock_);
   PendingSyncMessageQueue::iterator it;
   for (it = message_queue_.begin(); it != message_queue_.end(); ++it) {
     SyncMessageCallContext* context = *it;