| Index: chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| index c6a63c59656b793d8912c79c5fc87c32dc23c0ce..e4336bc4e06665702ef255e2dc050b68428fb11d 100644
|
| --- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| @@ -96,7 +96,7 @@ class TestITunesDataProvider : public ITunesDataProvider {
|
|
|
| class TestITunesFileUtil : public ITunesFileUtil {
|
| public:
|
| - explicit TestITunesFileUtil(chrome::MediaPathFilter* media_path_filter,
|
| + explicit TestITunesFileUtil(MediaPathFilter* media_path_filter,
|
| ITunesDataProvider* data_provider)
|
| : ITunesFileUtil(media_path_filter),
|
| data_provider_(data_provider) {
|
| @@ -111,14 +111,13 @@ class TestITunesFileUtil : public ITunesFileUtil {
|
| ITunesDataProvider* data_provider_;
|
| };
|
|
|
| -class TestMediaFileSystemBackend
|
| - : public chrome::MediaFileSystemBackend {
|
| +class TestMediaFileSystemBackend : public MediaFileSystemBackend {
|
| public:
|
| TestMediaFileSystemBackend(const base::FilePath& profile_path,
|
| ITunesFileUtil* itunes_file_util)
|
| - : chrome::MediaFileSystemBackend(
|
| + : MediaFileSystemBackend(
|
| profile_path,
|
| - chrome::MediaFileSystemBackend::MediaTaskRunner().get()),
|
| + MediaFileSystemBackend::MediaTaskRunner().get()),
|
| test_file_util_(itunes_file_util) {}
|
|
|
| virtual fileapi::AsyncFileUtil*
|
| @@ -160,17 +159,17 @@ class ItunesFileUtilTest : public testing::Test {
|
| new quota::MockSpecialStoragePolicy();
|
|
|
| // Initialize fake ItunesDataProvider on media task runner thread.
|
| - chrome::MediaFileSystemBackend::MediaTaskRunner()->PostTask(
|
| + MediaFileSystemBackend::MediaTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ItunesFileUtilTest::SetUpDataProvider,
|
| base::Unretained(this)));
|
| base::WaitableEvent event(true, false /* initially_signalled */);
|
| - chrome::MediaFileSystemBackend::MediaTaskRunner()->PostTask(
|
| + MediaFileSystemBackend::MediaTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
|
| event.Wait();
|
|
|
| - media_path_filter_.reset(new chrome::MediaPathFilter());
|
| + media_path_filter_.reset(new MediaPathFilter());
|
| ScopedVector<fileapi::FileSystemBackend> additional_providers;
|
| additional_providers.push_back(new TestMediaFileSystemBackend(
|
| profile_dir_.path(),
|
| @@ -224,7 +223,7 @@ class ItunesFileUtilTest : public testing::Test {
|
| base::ScopedTempDir fake_library_dir_;
|
|
|
| scoped_refptr<fileapi::FileSystemContext> file_system_context_;
|
| - scoped_ptr<chrome::MediaPathFilter> media_path_filter_;
|
| + scoped_ptr<MediaPathFilter> media_path_filter_;
|
| scoped_ptr<TestITunesDataProvider> itunes_data_provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ItunesFileUtilTest);
|
|
|