| 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);
|
| };
|
|
|