diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /media/filters/file_data_source.cc | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
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
Diffstat (limited to 'media/filters/file_data_source.cc')
| -rw-r--r-- | media/filters/file_data_source.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc index 3fd1a04..64c61fb 100644 --- a/media/filters/file_data_source.cc +++ b/media/filters/file_data_source.cc @@ -50,7 +50,7 @@ void FileDataSource::Initialize(const std::string& url, } void FileDataSource::Stop(FilterCallback* callback) { - AutoLock l(lock_); + base::AutoLock l(lock_); if (file_) { file_util::CloseFile(file_); file_ = NULL; @@ -69,7 +69,7 @@ const MediaFormat& FileDataSource::media_format() { void FileDataSource::Read(int64 position, size_t size, uint8* data, ReadCallback* read_callback) { DCHECK(file_); - AutoLock l(lock_); + base::AutoLock l(lock_); scoped_ptr<ReadCallback> callback(read_callback); if (file_) { #if defined(OS_WIN) @@ -101,7 +101,7 @@ void FileDataSource::Read(int64 position, size_t size, uint8* data, bool FileDataSource::GetSize(int64* size_out) { DCHECK(size_out); DCHECK(file_); - AutoLock l(lock_); + base::AutoLock l(lock_); *size_out = file_size_; return (NULL != file_); } |