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

Unified Diff: media/filters/file_data_source.h

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/ffmpeg_glue.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/file_data_source.h
diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h
index f6aed76d64d7144763d956eb852fc6103c0154cd..7be9a5a4e84371338d57ce2d9d72f6dd7c0c4f7e 100644
--- a/media/filters/file_data_source.h
+++ b/media/filters/file_data_source.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/gtest_prod_util.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
#include "media/base/filters.h"
namespace media {
@@ -54,7 +54,7 @@ class FileDataSource : public DataSource {
// TODO(ralphl): Ideally this would use asynchronous I/O or we will know
// that we will block for a short period of time in reads. Otherwise, we can
// hang the pipeline Stop.
- Lock lock_;
+ base::Lock lock_;
DISALLOW_COPY_AND_ASSIGN(FileDataSource);
};
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698