From 20305ec6f1acf21392c2f3938a14a96f1e28e76d Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 21 Jan 2011 04:55:52 +0000 Subject: 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 --- chrome/browser/download/download_file_manager.cc | 2 +- chrome/browser/download/download_types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/download') diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc index b897464..05b8147 100644 --- a/chrome/browser/download/download_file_manager.cc +++ b/chrome/browser/download/download_file_manager.cc @@ -196,7 +196,7 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); std::vector contents; { - AutoLock auto_lock(buffer->lock); + base::AutoLock auto_lock(buffer->lock); contents.swap(buffer->contents); } diff --git a/chrome/browser/download/download_types.h b/chrome/browser/download/download_types.h index bf3a9c7..56d07af 100644 --- a/chrome/browser/download/download_types.h +++ b/chrome/browser/download/download_types.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/linked_ptr.h" -#include "base/lock.h" +#include "base/synchronization/lock.h" #include "net/base/file_stream.h" namespace net { @@ -27,7 +27,7 @@ struct DownloadBuffer { DownloadBuffer(); ~DownloadBuffer(); - Lock lock; + base::Lock lock; typedef std::pair Contents; std::vector contents; }; -- cgit v1.1