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

webkit/fileapi/file_system_quota_client.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_quota_client.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/sequenced_task_runner.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 
-using base::MessageLoopProxy;
+using base::SequencedTaskRunner;
 using quota::QuotaThreadTask;
 using quota::StorageType;
 
 namespace fileapi {
 
 class FileSystemQuotaClient::GetOriginUsageTask : public QuotaThreadTask {
  public:
   GetOriginUsageTask(
       FileSystemQuotaClient* quota_client,
-      scoped_refptr<MessageLoopProxy> file_message_loop,
       const GURL& origin_url,
       FileSystemType type)
-      : QuotaThreadTask(quota_client, file_message_loop),
+      : QuotaThreadTask(quota_client, quota_client->file_task_runner()),
         quota_client_(quota_client),
         origin_url_(origin_url),
         type_(type),
         fs_usage_(0) {
     DCHECK(quota_client_);
     file_system_context_ = quota_client_->file_system_context_;
   }
 
  protected:
   virtual ~GetOriginUsageTask() {}
@@ skipping 13 matching lines @@
   scoped_refptr<FileSystemContext> file_system_context_;
   GURL origin_url_;
   FileSystemType type_;
   int64 fs_usage_;
 };
 
 class FileSystemQuotaClient::GetOriginsForTypeTask : public QuotaThreadTask {
  public:
   GetOriginsForTypeTask(
       FileSystemQuotaClient* quota_client,
-      scoped_refptr<MessageLoopProxy> file_message_loop,
       FileSystemType type)
-      : QuotaThreadTask(quota_client, file_message_loop),
+      : QuotaThreadTask(quota_client, quota_client->file_task_runner()),
         quota_client_(quota_client),
         type_(type) {
     DCHECK(quota_client_);
     file_system_context_ = quota_client_->file_system_context_;
   }
 
  protected:
   virtual ~GetOriginsForTypeTask() {}
 
   // QuotaThreadTask:
@@ skipping 11 matching lines @@
   FileSystemQuotaClient* quota_client_;
   scoped_refptr<FileSystemContext> file_system_context_;
   std::set<GURL> origins_;
   FileSystemType type_;
 };
 
 class FileSystemQuotaClient::GetOriginsForHostTask : public QuotaThreadTask {
  public:
   GetOriginsForHostTask(
       FileSystemQuotaClient* quota_client,
-      scoped_refptr<MessageLoopProxy> file_message_loop,
       FileSystemType type,
       const std::string& host)
-      : QuotaThreadTask(quota_client, file_message_loop),
+      : QuotaThreadTask(quota_client, quota_client->file_task_runner()),
         quota_client_(quota_client),
         type_(type),
         host_(host) {
     DCHECK(quota_client_);
     file_system_context_ = quota_client_->file_system_context_;
   }
 
  protected:
   virtual ~GetOriginsForHostTask() {}
 
@@ skipping 14 matching lines @@
   std::set<GURL> origins_;
   FileSystemType type_;
   std::string host_;
 };
 
 class FileSystemQuotaClient::DeleteOriginTask
     : public QuotaThreadTask {
  public:
   DeleteOriginTask(
       FileSystemQuotaClient* quota_client,
-      scoped_refptr<MessageLoopProxy> file_message_loop,
       const GURL& origin,
       FileSystemType type,
       const DeletionCallback& callback)
-      : QuotaThreadTask(quota_client, file_message_loop),
+      : QuotaThreadTask(quota_client, quota_client->file_task_runner()),
         file_system_context_(quota_client->file_system_context_),
         origin_(origin),
         type_(type),
         status_(quota::kQuotaStatusUnknown),
         callback_(callback) {
   }
 
  protected:
   virtual ~DeleteOriginTask() {}
 
@@ skipping 12 matching lines @@
 
  private:
   FileSystemContext* file_system_context_;
   GURL origin_;
   FileSystemType type_;
   quota::QuotaStatusCode status_;
   DeletionCallback callback_;
 };
 
 FileSystemQuotaClient::FileSystemQuotaClient(
-    scoped_refptr<base::MessageLoopProxy> file_message_loop,
     FileSystemContext* file_system_context,
     bool is_incognito)
-    : file_message_loop_(file_message_loop),
-      file_system_context_(file_system_context),
+    : file_system_context_(file_system_context),
       is_incognito_(is_incognito) {
-  DCHECK(file_message_loop);
 }
 
 FileSystemQuotaClient::~FileSystemQuotaClient() {}
 
 quota::QuotaClient::ID FileSystemQuotaClient::id() const {
   return quota::QuotaClient::kFileSystem;
 }
 
 void FileSystemQuotaClient::OnQuotaManagerDestroyed() {
   delete this;
@@ skipping 10 matching lines @@
     callback.Run(0);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_usage_callbacks_.Add(
           std::make_pair(type, origin_url.spec()), callback)) {
     scoped_refptr<GetOriginUsageTask> task(
-        new GetOriginUsageTask(this, file_message_loop_, origin_url, type));
+        new GetOriginUsageTask(this, origin_url, type));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForType(
     StorageType storage_type,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
 
   std::set<GURL> origins;
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
     callback.Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_origins_for_type_callbacks_.Add(type, callback)) {
     scoped_refptr<GetOriginsForTypeTask> task(
-        new GetOriginsForTypeTask(this, file_message_loop_, type));
+        new GetOriginsForTypeTask(this, type));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::GetOriginsForHost(
     StorageType storage_type,
     const std::string& host,
     const GetOriginsCallback& callback) {
   DCHECK(!callback.is_null());
 
   std::set<GURL> origins;
   if (is_incognito_) {
     // We don't support FileSystem in incognito mode yet.
     callback.Run(origins, storage_type);
     return;
   }
 
   FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
   DCHECK(type != kFileSystemTypeUnknown);
 
   if (pending_origins_for_host_callbacks_.Add(
           std::make_pair(type, host), callback)) {
     scoped_refptr<GetOriginsForHostTask> task(
-        new GetOriginsForHostTask(this, file_message_loop_,
-                                  type, host));
+        new GetOriginsForHostTask(this, type, host));
     task->Start();
   }
 }
 
 void FileSystemQuotaClient::DeleteOriginData(const GURL& origin,
                                              StorageType type,
                                              const DeletionCallback& callback) {
   FileSystemType fs_type = QuotaStorageTypeToFileSystemType(type);
   DCHECK(fs_type != kFileSystemTypeUnknown);
   scoped_refptr<DeleteOriginTask> task(
-      new DeleteOriginTask(this, file_message_loop_,
-                           origin, fs_type, callback));
+      new DeleteOriginTask(this, origin, fs_type, callback));
   task->Start();
 }
 
 void FileSystemQuotaClient::DidGetOriginUsage(
     FileSystemType type, const GURL& origin_url, int64 usage) {
   TypeAndHostOrOrigin type_and_origin(std::make_pair(
       type, origin_url.spec()));
   DCHECK(pending_usage_callbacks_.HasCallbacks(type_and_origin));
   pending_usage_callbacks_.Run(type_and_origin, usage);
 }
 
 void FileSystemQuotaClient::DidGetOriginsForType(
     FileSystemType type, const std::set<GURL>& origins) {
   DCHECK(pending_origins_for_type_callbacks_.HasCallbacks(type));
   pending_origins_for_type_callbacks_.Run(type, origins,
       FileSystemTypeToQuotaStorageType(type));
 }
 
 void FileSystemQuotaClient::DidGetOriginsForHost(
     const TypeAndHostOrOrigin& type_and_host, const std::set<GURL>& origins) {
   DCHECK(pending_origins_for_host_callbacks_.HasCallbacks(type_and_host));
   pending_origins_for_host_callbacks_.Run(type_and_host, origins,
       FileSystemTypeToQuotaStorageType(type_and_host.first));
 }
 
+base::SequencedTaskRunner* FileSystemQuotaClient::file_task_runner() const {
+  return file_system_context_->file_task_runner();
+}
+
 }  // namespace fileapi