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/task_marshaller.cc b/chrome_frame/task_marshaller.cc
index 9b6ba20..4b257a6 100644
--- a/chrome_frame/task_marshaller.cc
+++ b/chrome_frame/task_marshaller.cc
@@ -38,7 +38,7 @@ void TaskMarshallerThroughMessageQueue::PostDelayedTask(
     Task* task,
     base::TimeDelta& delay) {
   DCHECK(wnd_ != NULL);
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   DelayedTask delayed_task(task, base::Time::Now() + delay);
   delayed_tasks_.push(delayed_task);
   // If we become the 'top' task - reschedule the timer.
@@ -70,7 +70,7 @@ BOOL TaskMarshallerThroughMessageQueue::ProcessWindowMessage(HWND hWnd,
 }
 
 Task* TaskMarshallerThroughMessageQueue::PopTask() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   Task* task = NULL;
   if (!pending_tasks_.empty()) {
     task = pending_tasks_.front();
@@ -118,7 +118,7 @@ void TaskMarshallerThroughMessageQueue::ExecuteDelayedTasks() {
 }
 
 void TaskMarshallerThroughMessageQueue::DeleteAll() {
-  AutoLock lock(lock_);
+  base::AutoLock lock(lock_);
   DVLOG_IF(1, !pending_tasks_.empty()) << "Destroying "
                                        << pending_tasks_.size()
                                        << " pending tasks.";