Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1652)

Unified Diff: media/filters/file_data_source.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/file_data_source.h ('k') | media/filters/video_renderer_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/file_data_source.cc
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index 3fd1a04fa525b6ff7b5a617d6619d6d438ef7b35..64c61fbda5900f647b67b025447f3983d8a8ec13 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_);
}
« no previous file with comments | « media/filters/file_data_source.h ('k') | media/filters/video_renderer_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698