Deprecate media_task_runner() from FileSystemTaskRunners

It looks we no longer need to keep the value there.

BUG=241701
TEST=green bots
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/16466006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205137 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 19 deletions

diff --git a/webkit/browser/fileapi/file_system_task_runners.cc b/webkit/browser/fileapi/file_system_task_runners.cc
index 2d36dde..59d0abd 100644
--- a/webkit/browser/fileapi/file_system_task_runners.cc
+++ b/webkit/browser/fileapi/file_system_task_runners.cc
@@ -5,20 +5,15 @@
 #include "webkit/browser/fileapi/file_system_task_runners.h"
 
 #include "base/message_loop_proxy.h"
-#include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 
 namespace fileapi {
 
-const char kMediaTaskRunnerName[] = "media-task-runner";
-
 FileSystemTaskRunners::FileSystemTaskRunners(
     base::SingleThreadTaskRunner* io_task_runner,
-    base::SingleThreadTaskRunner* file_task_runner,
-    base::SequencedTaskRunner* media_task_runner)
+    base::SingleThreadTaskRunner* file_task_runner)
     : io_task_runner_(io_task_runner),
-      file_task_runner_(file_task_runner),
-      media_task_runner_(media_task_runner) {
+      file_task_runner_(file_task_runner) {
 }
 
 // static
@@ -26,7 +21,6 @@ scoped_ptr<FileSystemTaskRunners>
 FileSystemTaskRunners::CreateMockTaskRunners() {
   return make_scoped_ptr(new FileSystemTaskRunners(
       base::MessageLoopProxy::current(),
-      base::MessageLoopProxy::current(),
       base::MessageLoopProxy::current()));
 }
 
diff --git a/webkit/browser/fileapi/file_system_task_runners.h b/webkit/browser/fileapi/file_system_task_runners.h
index 4695e79..dea61fe 100644
--- a/webkit/browser/fileapi/file_system_task_runners.h
+++ b/webkit/browser/fileapi/file_system_task_runners.h
@@ -10,21 +10,17 @@
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
-class SequencedTaskRunner;
 class SingleThreadTaskRunner;
 }  // namespace
 
 namespace fileapi {
 
-WEBKIT_STORAGE_EXPORT extern const char kMediaTaskRunnerName[];
-
 // This class holds task runners used for filesystem related stuff.
 class WEBKIT_STORAGE_EXPORT FileSystemTaskRunners {
  public:
   FileSystemTaskRunners(
       base::SingleThreadTaskRunner* io_task_runner,
-      base::SingleThreadTaskRunner* file_task_runner,
-      base::SequencedTaskRunner* media_task_runner);
+      base::SingleThreadTaskRunner* file_task_runner);
 
   ~FileSystemTaskRunners();
 
@@ -38,14 +34,9 @@ class WEBKIT_STORAGE_EXPORT FileSystemTaskRunners {
     return file_task_runner_.get();
   }
 
-  base::SequencedTaskRunner* media_task_runner() {
-    return media_task_runner_.get();
-  }
-
  private:
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
-  scoped_refptr<base::SequencedTaskRunner> media_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemTaskRunners);
 };
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 5173a9a..e8d1181 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -209,7 +209,6 @@ void CannedSyncableFileSystem::SetUp() {
   file_system_context_ = new FileSystemContext(
       make_scoped_ptr(
           new fileapi::FileSystemTaskRunners(io_task_runner_.get(),
-                                             file_task_runner_.get(),
                                              file_task_runner_.get())),
       fileapi::ExternalMountPoints::CreateRefCounted().get(),
       storage_policy.get(),