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

Unified Diff: chrome/browser/media_galleries/imported_media_gallery_registry.cc

Issue 16466006: Deprecate media_task_runner() from FileSystemTaskRunners (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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
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 d8d006b9296665225c4d2fadfcf6d6147c24a4e1..8af0ef3d174832144681d8e8e35a82c115e2c17f 100644
--- a/chrome/browser/media_galleries/imported_media_gallery_registry.cc
+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.cc
@@ -8,10 +8,10 @@
#include "base/logging.h"
#include "base/threading/sequenced_worker_pool.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/picasa/picasa_data_provider.h"
#include "chrome/common/extensions/extension_constants.h"
#include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
#include "webkit/browser/fileapi/isolated_context.h"
using base::Bind;
@@ -23,7 +23,8 @@ namespace {
bool CurrentlyOnMediaTaskRunnerThread() {
base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
base::SequencedWorkerPool::SequenceToken media_sequence_token =
- pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName);
+ pool->GetNamedSequenceToken(
+ MediaFileSystemMountPointProvider::kMediaTaskRunnerName);
return pool->IsRunningSequenceOnCurrentThread(media_sequence_token);
}
@@ -32,7 +33,8 @@ scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() {
DCHECK(!CurrentlyOnMediaTaskRunnerThread());
base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
base::SequencedWorkerPool::SequenceToken media_sequence_token =
- pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName);
+ pool->GetNamedSequenceToken(
+ MediaFileSystemMountPointProvider::kMediaTaskRunnerName);
return pool->GetSequencedTaskRunner(media_sequence_token);
}
@@ -40,7 +42,7 @@ scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() {
static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky
g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER;
-}
+} // namespace
// static
ImportedMediaGalleryRegistry* ImportedMediaGalleryRegistry::GetInstance() {

Powered by Google App Engine
This is Rietveld 408576698