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/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc
index fea331c..1451650 100644
--- a/chrome_frame/cfproxy_support.cc
+++ b/chrome_frame/cfproxy_support.cc
@@ -220,7 +220,7 @@ void SyncMsgSender::QueueSyncMessage(const IPC::SyncMessage* msg,
                                      SyncMessageContext* ctx) {
   if (delegate) {
     // We are interested of the result.
-    AutoLock lock(messages_lock_);
+    base::AutoLock lock(messages_lock_);
     int id = IPC::SyncMessage::GetMessageId(*msg);
     // A message can be sent only once.
     DCHECK(messages_.end() == messages_.find(id));
@@ -232,7 +232,7 @@ void SyncMsgSender::QueueSyncMessage(const IPC::SyncMessage* msg,
 void SyncMsgSender::Cancel(ChromeProxyDelegate* delegate) {
   std::vector<SingleSentMessage*> cancelled;
   {
-    AutoLock lock(messages_lock_);
+    base::AutoLock lock(messages_lock_);
     SentMessages::iterator it = messages_.begin();
     for (; it != messages_.end(); ) {
       SingleSentMessage* origin = it->second;
@@ -254,7 +254,7 @@ void SyncMsgSender::Cancel(ChromeProxyDelegate* delegate) {
 }
 
 SyncMsgSender::SingleSentMessage* SyncMsgSender::RemoveMessage(int id) {
-  AutoLock lock(messages_lock_);
+  base::AutoLock lock(messages_lock_);
   SentMessages::iterator it = messages_.find(id);
   if (it == messages_.end()) {
     // Delegate is not interested in this sync message response.
@@ -287,7 +287,7 @@ void SyncMsgSender::OnChannelClosed() {
   SentMessages messages_sent;
   // Make a copy of the messages queue
   {
-    AutoLock lock(messages_lock_);
+    base::AutoLock lock(messages_lock_);
     messages_.swap(messages_sent);
   }