Change webkit/{fileapi,quota} code to use TaskRunner.

webkit/fileapi/file_system_context.cc

 // 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/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_interface.h"
 #include "webkit/fileapi/file_system_options.h"
 #include "webkit/fileapi/file_system_quota_client.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/isolated_mount_point_provider.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
 #if defined(OS_CHROMEOS)
 #include "webkit/chromeos/fileapi/cros_mount_point_provider.h"
 #endif
 
 using quota::QuotaClient;
 
 namespace fileapi {
 
 namespace {
 
 QuotaClient* CreateQuotaClient(
-    scoped_refptr<base::MessageLoopProxy> file_message_loop,
+    base::TaskRunner* file_task_runner,
     FileSystemContext* context,
     bool is_incognito) {
-  return new FileSystemQuotaClient(file_message_loop, context, is_incognito);
+  return new FileSystemQuotaClient(file_task_runner, context, is_incognito);
 }
 
 void DidOpenFileSystem(FileSystemContext::OpenFileSystemCallback callback,
                        const GURL& filesystem_root,
                        const std::string& filesystem_name,
                        base::PlatformFileError error) {
   callback.Run(error, filesystem_name, filesystem_root);
 }
 
 }  // anonymous namespace
 
 FileSystemContext::FileSystemContext(
-    scoped_refptr<base::MessageLoopProxy> file_message_loop,
-    scoped_refptr<base::MessageLoopProxy> io_message_loop,
-    scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
+    base::SingleThreadTaskRunner* file_task_runner,
+    base::SingleThreadTaskRunner* io_task_runner,
+    quota::SpecialStoragePolicy* special_storage_policy,
     quota::QuotaManagerProxy* quota_manager_proxy,
     const FilePath& profile_path,
     const FileSystemOptions& options)
-    : file_message_loop_(file_message_loop),
-      io_message_loop_(io_message_loop),
+    : file_task_runner_(file_task_runner),
+      io_task_runner_(io_task_runner),
       quota_manager_proxy_(quota_manager_proxy),
       sandbox_provider_(
           new SandboxMountPointProvider(
-              file_message_loop,
+              file_task_runner,
               profile_path,
               options)),
       isolated_provider_(new IsolatedMountPointProvider) {
   if (quota_manager_proxy) {
     quota_manager_proxy->RegisterClient(CreateQuotaClient(
-        file_message_loop, this, options.is_incognito()));
+        file_task_runner, this, options.is_incognito()));
   }
 #if defined(OS_CHROMEOS)
   external_provider_.reset(
       new chromeos::CrosMountPointProvider(special_storage_policy));
 #endif
 }
 
 FileSystemContext::~FileSystemContext() {
 }
 
 bool FileSystemContext::DeleteDataForOriginOnFileThread(
     const GURL& origin_url) {
-  DCHECK(file_message_loop_->BelongsToCurrentThread());
+  DCHECK(file_task_runner_->BelongsToCurrentThread());
   DCHECK(sandbox_provider());
 
   // Delete temporary and persistent data.
   return
       sandbox_provider()->DeleteOriginDataOnFileThread(
           quota_manager_proxy(), origin_url, kFileSystemTypeTemporary) &&
       sandbox_provider()->DeleteOriginDataOnFileThread(
           quota_manager_proxy(), origin_url, kFileSystemTypePersistent);
 }
 
 bool FileSystemContext::DeleteDataForOriginAndTypeOnFileThread(
     const GURL& origin_url, FileSystemType type) {
-  DCHECK(file_message_loop_->BelongsToCurrentThread());
+  DCHECK(file_task_runner_->BelongsToCurrentThread());
   if (type == fileapi::kFileSystemTypeTemporary ||
       type == fileapi::kFileSystemTypePersistent) {
     DCHECK(sandbox_provider());
     return sandbox_provider()->DeleteOriginDataOnFileThread(
         quota_manager_proxy(), origin_url, type);
   }
   return false;
 }
 
 FileSystemQuotaUtil*
@@ skipping 36 matching lines @@
 FileSystemContext::sandbox_provider() const {
   return sandbox_provider_.get();
 }
 
 ExternalFileSystemMountPointProvider*
 FileSystemContext::external_provider() const {
   return external_provider_.get();
 }
 
 void FileSystemContext::DeleteOnCorrectThread() const {
-  if (!io_message_loop_->BelongsToCurrentThread() &&
-      io_message_loop_->DeleteSoon(FROM_HERE, this)) {
+  if (file_task_runner_->BelongsToCurrentThread() &&

[michaeln, 2012/04/27 01:04:03]

Why the change from !IsOnIOThread to IsOnFileThread?

FileSystemContext is a refcounted object which makes it difficult to truely have
a handle on where exactly the last ref will be released. As coded i think this
class is assuming that it's either the IO thread or the FileThread and there and
anything else is an impossibility...

...but is that really a safe assumption given that things outside of the fileapi
may be hanging on to refs (for example gdrive stuff).

What goes wrong if the the test original test is retained?

[kinuko, 2012/04/27 10:10:29]

Sorry this change was not intended. Fixed.

+      io_task_runner_->DeleteSoon(FROM_HERE, this)) {
     return;
   }
   delete this;
 }
 
 void FileSystemContext::OpenFileSystem(
     const GURL& origin_url,
     FileSystemType type,
     bool create,
     OpenFileSystemCallback callback) {
   DCHECK(!callback.is_null());
 
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(type);
   if (!mount_point_provider) {
     callback.Run(base::PLATFORM_FILE_ERROR_SECURITY, std::string(), GURL());
     return;
   }
 
   GURL root_url = GetFileSystemRootURI(origin_url, type);
   std::string name = GetFileSystemName(origin_url, type);
 
   mount_point_provider->ValidateFileSystemRoot(
       origin_url, type, create,
       base::Bind(&DidOpenFileSystem, callback, root_url, name));
 }
 
 FileSystemOperationInterface* FileSystemContext::CreateFileSystemOperation(
     const GURL& url,
-    base::MessageLoopProxy* file_proxy) {
+    base::TaskRunner* file_proxy) {
   GURL origin_url;
   FileSystemType file_system_type = kFileSystemTypeUnknown;
   FilePath file_path;
   if (!CrackFileSystemURL(url, &origin_url, &file_system_type, &file_path))
     return NULL;
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(file_system_type);
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->CreateFileSystemOperation(
       origin_url, file_system_type, file_path, file_proxy, this);
 }
 
 webkit_blob::FileReader* FileSystemContext::CreateFileReader(
     const GURL& url,
     int64 offset,
-    base::MessageLoopProxy* file_proxy) {
+    base::TaskRunner* file_proxy) {
   GURL origin_url;
   FileSystemType file_system_type = kFileSystemTypeUnknown;
   FilePath file_path;
   if (!CrackFileSystemURL(url, &origin_url, &file_system_type, &file_path))
     return NULL;
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(file_system_type);
   if (!mount_point_provider)
     return NULL;
   return mount_point_provider->CreateFileReader(url, offset, file_proxy, this);
 }
 
 }  // namespace fileapi