commit abe477a0b141a14c67e64b6cb1c742d692899500
author brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jan 21 13:55:52 2011 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 11:04:05 2020 +0900
tree 64002564edb7765b3e14d4fefcf2788fc7ce75f4
parent c0f8558bfa792434813f708f13fbd27165e819c4

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


CrOS-Libchrome-Original-Commit: 20305ec6f1acf21392c2f3938a14a96f1e28e76d

ipc/ipc_sync_channel.cc

diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index fbad0f6..1c7edfa 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -55,7 +55,7 @@
   void QueueMessage(const Message& msg, SyncChannel::SyncContext* context) {
     bool was_task_pending;
     {
-      AutoLock auto_lock(message_lock_);
+      base::AutoLock auto_lock(message_lock_);
 
       was_task_pending = task_pending_;
       task_pending_ = true;
@@ -80,7 +80,7 @@
   // messages.
   void DispatchMessagesTask() {
     {
-      AutoLock auto_lock(message_lock_);
+      base::AutoLock auto_lock(message_lock_);
       task_pending_ = false;
     }
     DispatchMessages();
@@ -91,7 +91,7 @@
       Message* message;
       scoped_refptr<SyncChannel::SyncContext> context;
       {
-        AutoLock auto_lock(message_lock_);
+        base::AutoLock auto_lock(message_lock_);
         if (message_queue_.empty())
           break;
 
@@ -107,7 +107,7 @@
 
   // SyncChannel calls this in its destructor.
   void RemoveContext(SyncContext* context) {
-    AutoLock auto_lock(message_lock_);
+    base::AutoLock auto_lock(message_lock_);
 
     SyncMessageQueue::iterator iter = message_queue_.begin();
     while (iter != message_queue_.end()) {
@@ -185,7 +185,7 @@
   // message.
   WaitableEvent dispatch_event_;
   MessageLoop* listener_message_loop_;
-  Lock message_lock_;
+  base::Lock message_lock_;
   bool task_pending_;
   int listener_count_;
 
@@ -223,14 +223,14 @@
   PendingSyncMsg pending(SyncMessage::GetMessageId(*sync_msg),
                          sync_msg->GetReplyDeserializer(),
                          new WaitableEvent(true, false));
-  AutoLock auto_lock(deserializers_lock_);
+  base::AutoLock auto_lock(deserializers_lock_);
   deserializers_.push_back(pending);
 }
 
 bool SyncChannel::SyncContext::Pop() {
   bool result;
   {
-    AutoLock auto_lock(deserializers_lock_);
+    base::AutoLock auto_lock(deserializers_lock_);
     PendingSyncMsg msg = deserializers_.back();
     delete msg.deserializer;
     delete msg.done_event;
@@ -251,7 +251,7 @@
 }
 
 WaitableEvent* SyncChannel::SyncContext::GetSendDoneEvent() {
-  AutoLock auto_lock(deserializers_lock_);
+  base::AutoLock auto_lock(deserializers_lock_);
   return deserializers_.back().done_event;
 }
 
@@ -264,7 +264,7 @@
 }
 
 bool SyncChannel::SyncContext::TryToUnblockListener(const Message* msg) {
-  AutoLock auto_lock(deserializers_lock_);
+  base::AutoLock auto_lock(deserializers_lock_);
   if (deserializers_.empty() ||
       !SyncMessage::IsMessageReplyTo(*msg, deserializers_.back().id)) {
     return false;
@@ -324,7 +324,7 @@
 }
 
 void SyncChannel::SyncContext::OnSendTimeout(int message_id) {
-  AutoLock auto_lock(deserializers_lock_);
+  base::AutoLock auto_lock(deserializers_lock_);
   PendingSyncMessageQueue::iterator iter;
   for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++) {
     if (iter->id == message_id) {
@@ -335,7 +335,7 @@
 }
 
 void SyncChannel::SyncContext::CancelPendingSends() {
-  AutoLock auto_lock(deserializers_lock_);
+  base::AutoLock auto_lock(deserializers_lock_);
   PendingSyncMessageQueue::iterator iter;
   for (iter = deserializers_.begin(); iter != deserializers_.end(); iter++)
     iter->done_event->Signal();