Index: chrome/browser/media_galleries/imported_media_gallery_registry.cc |
diff --git a/chrome/browser/media_galleries/imported_media_gallery_registry.cc b/chrome/browser/media_galleries/imported_media_gallery_registry.cc |
index b9f6c13fb1f58c1208712492ae08f5153c3a2b5c..5f4b435334846c78e41017d254353e349278480c 100644 |
--- a/chrome/browser/media_galleries/imported_media_gallery_registry.cc |
+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.cc |
@@ -7,7 +7,7 @@ |
#include "base/bind.h" |
#include "base/logging.h" |
#include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h" |
-#include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h" |
+#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" |
#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" |
#include "chrome/common/extensions/extension_constants.h" |
#include "content/public/browser/browser_thread.h" |
@@ -49,7 +49,7 @@ std::string ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread( |
picasa_fsids_.insert(fsid); |
if (picasa_fsids_.size() == 1) { |
- MediaFileSystemMountPointProvider::MediaTaskRunner()->PostTask( |
+ MediaFileSystemBackend::MediaTaskRunner()->PostTask( |
FROM_HERE, |
Bind(&ImportedMediaGalleryRegistry::RegisterPicasaFileSystem, |
base::Unretained(this), database_path)); |
@@ -83,7 +83,7 @@ std::string ImportedMediaGalleryRegistry::RegisterITunesFilesystemOnUIThread( |
itunes_fsids_.insert(fsid); |
if (itunes_fsids_.size() == 1) { |
- MediaFileSystemMountPointProvider::MediaTaskRunner()->PostTask( |
+ MediaFileSystemBackend::MediaTaskRunner()->PostTask( |
FROM_HERE, |
Bind(&ImportedMediaGalleryRegistry::RegisterITunesFileSystem, |
base::Unretained(this), library_xml_path)); |
@@ -105,7 +105,7 @@ bool ImportedMediaGalleryRegistry::RevokeImportedFilesystemOnUIThread( |
#if defined(OS_WIN) || defined(OS_MACOSX) |
if (picasa_fsids_.erase(fsid)) { |
if (picasa_fsids_.empty()) { |
- MediaFileSystemMountPointProvider::MediaTaskRunner()->PostTask( |
+ MediaFileSystemBackend::MediaTaskRunner()->PostTask( |
FROM_HERE, |
Bind(&ImportedMediaGalleryRegistry::RevokePicasaFileSystem, |
base::Unretained(this))); |
@@ -115,7 +115,7 @@ bool ImportedMediaGalleryRegistry::RevokeImportedFilesystemOnUIThread( |
if (itunes_fsids_.erase(fsid)) { |
if (itunes_fsids_.empty()) { |
- MediaFileSystemMountPointProvider::MediaTaskRunner()->PostTask( |
+ MediaFileSystemBackend::MediaTaskRunner()->PostTask( |
FROM_HERE, |
Bind(&ImportedMediaGalleryRegistry::RevokeITunesFileSystem, |
base::Unretained(this))); |
@@ -131,7 +131,7 @@ bool ImportedMediaGalleryRegistry::RevokeImportedFilesystemOnUIThread( |
// static |
picasa::PicasaDataProvider* |
ImportedMediaGalleryRegistry::PicasaDataProvider() { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(GetInstance()->picasa_data_provider_); |
return GetInstance()->picasa_data_provider_.get(); |
} |
@@ -139,7 +139,7 @@ ImportedMediaGalleryRegistry::PicasaDataProvider() { |
// static |
itunes::ITunesDataProvider* |
ImportedMediaGalleryRegistry::ITunesDataProvider() { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(GetInstance()->itunes_data_provider_); |
return GetInstance()->itunes_data_provider_.get(); |
} |
@@ -157,26 +157,26 @@ ImportedMediaGalleryRegistry::~ImportedMediaGalleryRegistry() { |
#if defined(OS_WIN) || defined(OS_MACOSX) |
void ImportedMediaGalleryRegistry::RegisterPicasaFileSystem( |
const base::FilePath& database_path) { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(!picasa_data_provider_); |
picasa_data_provider_.reset(new picasa::PicasaDataProvider(database_path)); |
} |
void ImportedMediaGalleryRegistry::RevokePicasaFileSystem() { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(picasa_data_provider_); |
picasa_data_provider_.reset(); |
} |
void ImportedMediaGalleryRegistry::RegisterITunesFileSystem( |
const base::FilePath& xml_library_path) { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(!itunes_data_provider_); |
itunes_data_provider_.reset(new itunes::ITunesDataProvider(xml_library_path)); |
} |
void ImportedMediaGalleryRegistry::RevokeITunesFileSystem() { |
- DCHECK(MediaFileSystemMountPointProvider::CurrentlyOnMediaTaskRunnerThread()); |
+ DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
DCHECK(itunes_data_provider_); |
itunes_data_provider_.reset(); |
} |