Deprecate FileSystemTaskRunners

Now it only has two members, IO and default file task runner,
and only file runner accessor is used.

BUG=266232
TEST=compile
R=satorux@chromium.org, tzik@chromium.org, vandebo@chromium.org

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

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

21 files changed, 44 insertions, 135 deletions

diff --git a/webkit/browser/fileapi/file_system_context.cc b/webkit/browser/fileapi/file_system_context.cc
index df420f8..88abd24 100644
--- a/webkit/browser/fileapi/file_system_context.cc
+++ b/webkit/browser/fileapi/file_system_context.cc
@@ -19,7 +19,6 @@
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
 #include "webkit/browser/fileapi/file_system_options.h"
 #include "webkit/browser/fileapi/file_system_quota_client.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/isolated_file_system_backend.h"
@@ -98,18 +97,20 @@ int FileSystemContext::GetPermissionPolicy(FileSystemType type) {
 }
 
 FileSystemContext::FileSystemContext(
-    scoped_ptr<FileSystemTaskRunners> task_runners,
+    base::SingleThreadTaskRunner* io_task_runner,
+    base::SequencedTaskRunner* file_task_runner,
     ExternalMountPoints* external_mount_points,
     quota::SpecialStoragePolicy* special_storage_policy,
     quota::QuotaManagerProxy* quota_manager_proxy,
     ScopedVector<FileSystemBackend> additional_backends,
     const base::FilePath& partition_path,
     const FileSystemOptions& options)
-    : task_runners_(task_runners.Pass()),
+    : io_task_runner_(io_task_runner),
+      default_file_task_runner_(file_task_runner),
       quota_manager_proxy_(quota_manager_proxy),
       sandbox_context_(new SandboxContext(
           quota_manager_proxy,
-          task_runners_->file_task_runner(),
+          file_task_runner,
           partition_path,
           special_storage_policy,
           options)),
@@ -120,8 +121,6 @@ FileSystemContext::FileSystemContext(
       external_mount_points_(external_mount_points),
       partition_path_(partition_path),
       operation_runner_(new FileSystemOperationRunner(this)) {
-  DCHECK(task_runners_.get());
-
   if (quota_manager_proxy) {
     quota_manager_proxy->RegisterClient(CreateQuotaClient(
             this, options.is_incognito()));
@@ -154,7 +153,7 @@ FileSystemContext::FileSystemContext(
 
 bool FileSystemContext::DeleteDataForOriginOnFileThread(
     const GURL& origin_url) {
-  DCHECK(task_runners_->file_task_runner()->RunsTasksOnCurrentThread());
+  DCHECK(default_file_task_runner()->RunsTasksOnCurrentThread());
   DCHECK(origin_url == origin_url.GetOrigin());
 
   bool success = true;
@@ -287,7 +286,7 @@ void FileSystemContext::DeleteFileSystem(
   }
 
   base::PostTaskAndReplyWithResult(
-      task_runners()->file_task_runner(),
+      default_file_task_runner(),
       FROM_HERE,
       // It is safe to pass Unretained(quota_util) since context owns it.
       base::Bind(&FileSystemQuotaUtil::DeleteOriginDataOnFileThread,
@@ -350,8 +349,8 @@ FileSystemContext::~FileSystemContext() {
 }
 
 void FileSystemContext::DeleteOnCorrectThread() const {
-  if (!task_runners_->io_task_runner()->RunsTasksOnCurrentThread() &&
-      task_runners_->io_task_runner()->DeleteSoon(FROM_HERE, this)) {
+  if (!io_task_runner_->RunsTasksOnCurrentThread() &&
+      io_task_runner_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   delete this;
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index a3d472c..8f84970 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -24,6 +24,8 @@
 
 namespace base {
 class FilePath;
+class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }
 
 namespace chrome {
@@ -53,7 +55,6 @@ class FileSystemOperation;
 class FileSystemOperationRunner;
 class FileSystemOptions;
 class FileSystemQuotaUtil;
-class FileSystemTaskRunners;
 class FileSystemURL;
 class IsolatedFileSystemBackend;
 class MountPoints;
@@ -75,11 +76,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // permission policy.
   static int GetPermissionPolicy(FileSystemType type);
 
-  // task_runners->file_task_runner() is used as default TaskRunner.
+  // file_task_runner is used as default TaskRunner.
   // Unless a FileSystemBackend is overridden in CreateFileSystemOperation,
   // it is used for all file operations and file related meta operations.
-  // The code assumes that
-  // task_runners->file_task_runner()->RunsTasksOnCurrentThread()
+  // The code assumes that file_task_runner->RunsTasksOnCurrentThread()
   // returns false if the current task is not running on the thread that allows
   // blocking file operations (like SequencedWorkerPool implementation does).
   //
@@ -93,7 +93,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // If none is given, this context only handles HTML5 Sandbox FileSystem
   // and Drag-and-drop Isolated FileSystem requests.
   FileSystemContext(
-      scoped_ptr<FileSystemTaskRunners> task_runners,
+      base::SingleThreadTaskRunner* io_task_runner,
+      base::SequencedTaskRunner* file_task_runner,
       ExternalMountPoints* external_mount_points,
       quota::SpecialStoragePolicy* special_storage_policy,
       quota::QuotaManagerProxy* quota_manager_proxy,
@@ -201,7 +202,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
   // Creates a new FileSystemOperationRunner.
   scoped_ptr<FileSystemOperationRunner> CreateFileSystemOperationRunner();
 
-  FileSystemTaskRunners* task_runners() { return task_runners_.get(); }
+  base::SequencedTaskRunner* default_file_task_runner() {
+    return default_file_task_runner_.get();
+  }
 
   FileSystemOperationRunner* operation_runner() {
     return operation_runner_.get();
@@ -272,7 +275,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
     return sandbox_backend_.get();
   }
 
-  scoped_ptr<FileSystemTaskRunners> task_runners_;
+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
+  scoped_refptr<base::SequencedTaskRunner> default_file_task_runner_;
 
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
 
diff --git a/webkit/browser/fileapi/file_system_context_unittest.cc b/webkit/browser/fileapi/file_system_context_unittest.cc
index 71566f2..92256af 100644
--- a/webkit/browser/fileapi/file_system_context_unittest.cc
+++ b/webkit/browser/fileapi/file_system_context_unittest.cc
@@ -10,7 +10,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/mock_file_system_options.h"
 #include "webkit/browser/quota/mock_quota_manager.h"
@@ -60,7 +59,8 @@ class FileSystemContextTest : public testing::Test {
  protected:
   FileSystemContext* CreateFileSystemContextForTest(
       ExternalMountPoints* external_mount_points) {
-    return new FileSystemContext(FileSystemTaskRunners::CreateMockTaskRunners(),
+    return new FileSystemContext(base::MessageLoopProxy::current().get(),
+                                 base::MessageLoopProxy::current().get(),
                                  external_mount_points,
                                  storage_policy_.get(),
                                  mock_quota_manager_->proxy(),
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.cc b/webkit/browser/fileapi/file_system_file_stream_reader.cc
index 7287178..71b3827 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.cc
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.cc
@@ -13,7 +13,6 @@
 #include "webkit/browser/blob/local_file_stream_reader.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 
 using webkit_blob::LocalFileStreamReader;
 
@@ -118,7 +117,7 @@ void FileSystemFileStreamReader::DidCreateSnapshot(
 
   local_file_reader_.reset(
       new LocalFileStreamReader(
-          file_system_context_->task_runners()->file_task_runner(),
+          file_system_context_->default_file_task_runner(),
           platform_path, initial_offset_, expected_modification_time_));
 
   callback.Run();
diff --git a/webkit/browser/fileapi/file_system_operation_context.cc b/webkit/browser/fileapi/file_system_operation_context.cc
index 3866bf0..dd333ba 100644
--- a/webkit/browser/fileapi/file_system_operation_context.cc
+++ b/webkit/browser/fileapi/file_system_operation_context.cc
@@ -6,14 +6,13 @@
 
 #include "base/sequenced_task_runner.h"
 #include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 
 namespace fileapi {
 
 FileSystemOperationContext::FileSystemOperationContext(
     FileSystemContext* context)
     : file_system_context_(context),
-      task_runner_(file_system_context_->task_runners()->file_task_runner()),
+      task_runner_(file_system_context_->default_file_task_runner()),
       allowed_bytes_growth_(0),
       quota_limit_type_(quota::kQuotaLimitTypeUnknown) {}
 
diff --git a/webkit/browser/fileapi/file_system_operation_impl.cc b/webkit/browser/fileapi/file_system_operation_impl.cc
index 6e07539..60f7990 100644
--- a/webkit/browser/fileapi/file_system_operation_impl.cc
+++ b/webkit/browser/fileapi/file_system_operation_impl.cc
@@ -17,7 +17,6 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_writer_delegate.h"
 #include "webkit/browser/fileapi/remove_operation_delegate.h"
diff --git a/webkit/browser/fileapi/file_system_quota_client.cc b/webkit/browser/fileapi/file_system_quota_client.cc
index 9e72e98..343a6e6 100644
--- a/webkit/browser/fileapi/file_system_quota_client.cc
+++ b/webkit/browser/fileapi/file_system_quota_client.cc
@@ -20,7 +20,6 @@
 #include "url/gurl.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_quota_util.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
 #include "webkit/common/fileapi/file_system_util.h"
@@ -199,7 +198,7 @@ void FileSystemQuotaClient::DeleteOriginData(
 }
 
 base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const {
-  return file_system_context_->task_runners()->file_task_runner();
+  return file_system_context_->default_file_task_runner();
 }
 
 }  // namespace fileapi
diff --git a/webkit/browser/fileapi/file_system_task_runners.cc b/webkit/browser/fileapi/file_system_task_runners.cc
deleted file mode 100644
index 819c2e7..0000000
--- a/webkit/browser/fileapi/file_system_task_runners.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/browser/fileapi/file_system_task_runners.h"
-
-#include "base/message_loop/message_loop_proxy.h"
-#include "base/single_thread_task_runner.h"
-
-namespace fileapi {
-
-FileSystemTaskRunners::FileSystemTaskRunners(
-    base::SingleThreadTaskRunner* io_task_runner,
-    base::SequencedTaskRunner* file_task_runner)
-    : io_task_runner_(io_task_runner),
-      file_task_runner_(file_task_runner) {
-}
-
-// static
-scoped_ptr<FileSystemTaskRunners>
-FileSystemTaskRunners::CreateMockTaskRunners() {
-  return make_scoped_ptr(
-      new FileSystemTaskRunners(base::MessageLoopProxy::current().get(),
-                                base::MessageLoopProxy::current().get()));
-}
-
-FileSystemTaskRunners::~FileSystemTaskRunners() {
-}
-
-}  // namespace fileapi
diff --git a/webkit/browser/fileapi/file_system_task_runners.h b/webkit/browser/fileapi/file_system_task_runners.h
deleted file mode 100644
index 2470bfa..0000000
--- a/webkit/browser/fileapi/file_system_task_runners.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_TASK_RUNNERS_H_
-#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_TASK_RUNNERS_H_
-
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-
-namespace base {
-class SequencedTaskRunner;
-class SingleThreadTaskRunner;
-}  // namespace
-
-namespace fileapi {
-
-// This class holds task runners used for filesystem related stuff.
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemTaskRunners {
- public:
-  FileSystemTaskRunners(
-      base::SingleThreadTaskRunner* io_task_runner,
-      base::SequencedTaskRunner* file_task_runner);
-
-  ~FileSystemTaskRunners();
-
-  static scoped_ptr<FileSystemTaskRunners> CreateMockTaskRunners();
-
-  base::SingleThreadTaskRunner* io_task_runner() {
-    return io_task_runner_.get();
-  }
-
-  base::SequencedTaskRunner* file_task_runner() {
-    return file_task_runner_.get();
-  }
-
- private:
-  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
-  scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileSystemTaskRunners);
-};
-
-}  // namespace fileapi
-
-#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_TASK_RUNNERS_H_
diff --git a/webkit/browser/fileapi/isolated_file_system_backend.cc b/webkit/browser/fileapi/isolated_file_system_backend.cc
index c46edc0..db59e35 100644
--- a/webkit/browser/fileapi/isolated_file_system_backend.cc
+++ b/webkit/browser/fileapi/isolated_file_system_backend.cc
@@ -20,7 +20,6 @@
 #include "webkit/browser/fileapi/file_system_file_stream_reader.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_impl.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/isolated_file_util.h"
 #include "webkit/browser/fileapi/local_file_stream_writer.h"
@@ -127,7 +126,7 @@ IsolatedFileSystemBackend::CreateFileStreamReader(
     FileSystemContext* context) const {
   return scoped_ptr<webkit_blob::FileStreamReader>(
       new webkit_blob::LocalFileStreamReader(
-          context->task_runners()->file_task_runner(),
+          context->default_file_task_runner(),
           url.path(), offset, expected_modification_time));
 }
 
@@ -136,7 +135,7 @@ scoped_ptr<FileStreamWriter> IsolatedFileSystemBackend::CreateFileStreamWriter(
     int64 offset,
     FileSystemContext* context) const {
   return scoped_ptr<FileStreamWriter>(new LocalFileStreamWriter(
-      context->task_runners()->file_task_runner(), url.path(), offset));
+      context->default_file_task_runner(), url.path(), offset));
 }
 
 FileSystemQuotaUtil* IsolatedFileSystemBackend::GetQuotaUtil() {
diff --git a/webkit/browser/fileapi/isolated_file_util_unittest.cc b/webkit/browser/fileapi/isolated_file_util_unittest.cc
index 4d6b447..fee8ed1 100644
--- a/webkit/browser/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/isolated_file_util_unittest.cc
@@ -19,7 +19,6 @@
 #include "webkit/browser/fileapi/async_file_test_helper.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/isolated_file_util.h"
 #include "webkit/browser/fileapi/local_file_util.h"
diff --git a/webkit/browser/fileapi/mock_file_system_context.cc b/webkit/browser/fileapi/mock_file_system_context.cc
index 329e1a3..e2556d5 100644
--- a/webkit/browser/fileapi/mock_file_system_context.cc
+++ b/webkit/browser/fileapi/mock_file_system_context.cc
@@ -8,7 +8,6 @@
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/mock_file_system_options.h"
 #include "webkit/browser/fileapi/test_file_system_backend.h"
 #include "webkit/browser/quota/mock_special_storage_policy.h"
@@ -30,7 +29,8 @@ FileSystemContext* CreateFileSystemContextWithAdditionalProvidersForTesting(
     ScopedVector<FileSystemBackend> additional_providers,
     const base::FilePath& base_path) {
   return new FileSystemContext(
-      FileSystemTaskRunners::CreateMockTaskRunners(),
+      base::MessageLoopProxy::current().get(),
+      base::MessageLoopProxy::current().get(),
       ExternalMountPoints::CreateRefCounted().get(),
       make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(),
       quota_manager_proxy,
diff --git a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
index 8f44d8b..c4f409f 100644
--- a/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
@@ -19,7 +19,6 @@
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/mock_file_change_observer.h"
 #include "webkit/browser/fileapi/mock_file_system_context.h"
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
index 9e467bc..2e075ce 100644
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
@@ -13,7 +13,6 @@
 #include "webkit/browser/fileapi/file_observers.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/local_file_stream_writer.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/fileapi/file_system_util.h"
@@ -139,7 +138,7 @@ void SandboxFileStreamWriter::DidCreateSnapshotFile(
   }
   DCHECK(!local_file_writer_.get());
   local_file_writer_.reset(new LocalFileStreamWriter(
-      file_system_context_->task_runners()->file_task_runner(), platform_path,
+      file_system_context_->default_file_task_runner(), platform_path,
       initial_offset_));
 
   quota::QuotaManagerProxy* quota_manager_proxy =
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend.cc b/webkit/browser/fileapi/sandbox_file_system_backend.cc
index 97214e7..20f7329 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend.cc
+++ b/webkit/browser/fileapi/sandbox_file_system_backend.cc
@@ -17,7 +17,6 @@
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_impl.h"
 #include "webkit/browser/fileapi/file_system_options.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/obfuscated_file_util.h"
 #include "webkit/browser/fileapi/sandbox_context.h"
diff --git a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
index 6620517..179bf9b 100644
--- a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
+++ b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
@@ -12,7 +12,6 @@
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/mock_file_system_context.h"
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index 22a7e68..14d3b41 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -20,7 +20,6 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/mock_file_system_options.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend.h"
 #include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
@@ -237,9 +236,8 @@ void CannedSyncableFileSystem::SetUp() {
   additional_backends.push_back(new SyncFileSystemBackend());
 
   file_system_context_ = new FileSystemContext(
-      make_scoped_ptr(
-          new fileapi::FileSystemTaskRunners(io_task_runner_.get(),
-                                             file_task_runner_.get())),
+      io_task_runner_.get(),
+      file_task_runner_.get(),
       fileapi::ExternalMountPoints::CreateRefCounted().get(),
       storage_policy.get(),
       quota_manager_->proxy(),
diff --git a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
index 83d5f96..c894b64 100644
--- a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
@@ -16,7 +16,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/blob/mock_blob_url_request_context.h"
 #include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
 #include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/browser/fileapi/syncable/sync_file_system_backend.h"
diff --git a/webkit/browser/fileapi/syncable/local_file_sync_context.cc b/webkit/browser/fileapi/syncable/local_file_sync_context.cc
index 8b52c14..75c4666 100644
--- a/webkit/browser/fileapi/syncable/local_file_sync_context.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context.cc
@@ -14,7 +14,6 @@
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/syncable/file_change.h"
 #include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
 #include "webkit/browser/fileapi/syncable/local_origin_change_observer.h"
@@ -93,7 +92,7 @@ void LocalFileSyncContext::GetFileForLocalSync(
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
 
   std::deque<FileSystemURL>* urls = new std::deque<FileSystemURL>;
-  file_system_context->task_runners()->file_task_runner()->PostTaskAndReply(
+  file_system_context->default_file_task_runner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&LocalFileSyncContext::GetNextURLsForSyncOnFileThread,
                  this, make_scoped_refptr(file_system_context),
@@ -109,10 +108,10 @@ void LocalFileSyncContext::ClearChangesForURL(
     const base::Closure& done_callback) {
   // This is initially called on UI thread and to be relayed to FILE thread.
   DCHECK(file_system_context);
-  if (!file_system_context->task_runners()->file_task_runner()->
+  if (!file_system_context->default_file_task_runner()->
           RunsTasksOnCurrentThread()) {
     DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
-    file_system_context->task_runners()->file_task_runner()->PostTask(
+    file_system_context->default_file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&LocalFileSyncContext::ClearChangesForURL,
                    this, make_scoped_refptr(file_system_context),
@@ -296,10 +295,10 @@ void LocalFileSyncContext::RecordFakeLocalChange(
     const SyncStatusCallback& callback) {
   // This is called on UI thread and to be relayed to FILE thread.
   DCHECK(file_system_context);
-  if (!file_system_context->task_runners()->file_task_runner()->
+  if (!file_system_context->default_file_task_runner()->
           RunsTasksOnCurrentThread()) {
     DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
-    file_system_context->task_runners()->file_task_runner()->PostTask(
+    file_system_context->default_file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&LocalFileSyncContext::RecordFakeLocalChange,
                    this, make_scoped_refptr(file_system_context),
@@ -348,10 +347,10 @@ void LocalFileSyncContext::HasPendingLocalChanges(
     const HasPendingLocalChangeCallback& callback) {
   // This gets called on UI thread and relays the task on FILE thread.
   DCHECK(file_system_context);
-  if (!file_system_context->task_runners()->file_task_runner()->
+  if (!file_system_context->default_file_task_runner()->
           RunsTasksOnCurrentThread()) {
     DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
-    file_system_context->task_runners()->file_task_runner()->PostTask(
+    file_system_context->default_file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&LocalFileSyncContext::HasPendingLocalChanges,
                    this, make_scoped_refptr(file_system_context),
@@ -468,7 +467,7 @@ void LocalFileSyncContext::InitializeFileSystemContextOnIOThread(
     scoped_ptr<LocalFileChangeTracker>* tracker_ptr(
         new scoped_ptr<LocalFileChangeTracker>);
     base::PostTaskAndReplyWithResult(
-        file_system_context->task_runners()->file_task_runner(),
+        file_system_context->default_file_task_runner(),
         FROM_HERE,
         base::Bind(&LocalFileSyncContext::InitializeChangeTrackerOnFileThread,
                    this, tracker_ptr,
@@ -505,7 +504,7 @@ SyncStatusCode LocalFileSyncContext::InitializeChangeTrackerOnFileThread(
   DCHECK(origins_with_changes);
   tracker_ptr->reset(new LocalFileChangeTracker(
           file_system_context->partition_path(),
-          file_system_context->task_runners()->file_task_runner()));
+          file_system_context->default_file_task_runner()));
   const SyncStatusCode status = (*tracker_ptr)->Initialize(file_system_context);
   if (status != SYNC_STATUS_OK)
     return status;
@@ -582,7 +581,7 @@ void LocalFileSyncContext::GetNextURLsForSyncOnFileThread(
     FileSystemContext* file_system_context,
     std::deque<FileSystemURL>* urls) {
   DCHECK(file_system_context);
-  DCHECK(file_system_context->task_runners()->file_task_runner()->
+  DCHECK(file_system_context->default_file_task_runner()->
              RunsTasksOnCurrentThread());
   SyncFileSystemBackend* backend =
       SyncFileSystemBackend::GetBackend(file_system_context);
@@ -644,14 +643,14 @@ void LocalFileSyncContext::DidGetWritingStatusForSync(
     const LocalFileSyncInfoCallback& callback) {
   // This gets called on UI thread and relays the task on FILE thread.
   DCHECK(file_system_context);
-  if (!file_system_context->task_runners()->file_task_runner()->
+  if (!file_system_context->default_file_task_runner()->
           RunsTasksOnCurrentThread()) {
     DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
     if (shutdown_on_ui_) {
       callback.Run(SYNC_STATUS_ABORT, LocalFileSyncInfo());
       return;
     }
-    file_system_context->task_runners()->file_task_runner()->PostTask(
+    file_system_context->default_file_task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&LocalFileSyncContext::DidGetWritingStatusForSync,
                    this, make_scoped_refptr(file_system_context),
diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc
index b1574ed..90629ae 100644
--- a/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_unittest.cc
@@ -7,7 +7,6 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/sandbox_file_system_test_helper.h"
 #include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
index dde3351..50bf9bc 100644
--- a/webkit/storage_browser.gyp
+++ b/webkit/storage_browser.gyp
@@ -144,8 +144,6 @@
         'browser/fileapi/file_system_quota_client.cc',
         'browser/fileapi/file_system_quota_client.h',
         'browser/fileapi/file_system_quota_util.h',
-        'browser/fileapi/file_system_task_runners.cc',
-        'browser/fileapi/file_system_task_runners.h',
         'browser/fileapi/file_system_url.cc',
         'browser/fileapi/file_system_url.h',
         'browser/fileapi/file_system_url_request_job.cc',