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

webkit/blob/local_file_reader.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/blob/local_file_reader.h"
 
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
+#include "base/task_runner.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace webkit_blob {
 
 namespace {
 
 const int kOpenFlagsForRead = base::PLATFORM_FILE_OPEN |
                               base::PLATFORM_FILE_READ |
@@ skipping 53 matching lines @@
     case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
       return net::ERR_ACCESS_DENIED;
     default:
       return net::ERR_FAILED;
   }
 }
 
 // A helper class to open, verify and seek a file stream for a given path.
 class LocalFileReader::OpenFileStreamHelper {
  public:
-  explicit OpenFileStreamHelper(base::MessageLoopProxy* file_thread_proxy)
-      : file_thread_proxy_(file_thread_proxy),
+  explicit OpenFileStreamHelper(base::TaskRunner* task_runner)
+      : task_runner_(task_runner),
         file_handle_(base::kInvalidPlatformFileValue),
         result_(net::OK) {}
   ~OpenFileStreamHelper() {
     if (file_handle_ != base::kInvalidPlatformFileValue) {
-      file_thread_proxy_->PostTask(
+      task_runner_->PostTask(
           FROM_HERE,
           base::Bind(base::IgnoreResult(&base::ClosePlatformFile),
                      file_handle_));
     }
   }
 
   void OpenAndVerifyOnFileThread(const FilePath& file_path,
                                  const base::Time& expected_modification_time) {
     base::PlatformFileError file_error = base::PLATFORM_FILE_OK;
     file_handle_ = base::CreatePlatformFile(
@@ skipping 28 matching lines @@
     file_handle_ = base::kInvalidPlatformFileValue;
     result_ = stream_impl->Seek(net::FROM_BEGIN, initial_offset,
                                 base::Bind(&DidSeekFile, callback,
                                            base::Passed(&stream_impl),
                                            initial_offset));
     if (result_ != net::ERR_IO_PENDING)
       callback.Run(result_, stream_impl.Pass());
   }
 
  private:
-  scoped_refptr<base::MessageLoopProxy> file_thread_proxy_;
+  scoped_refptr<base::TaskRunner> task_runner_;
   base::PlatformFile file_handle_;
   int result_;
   DISALLOW_COPY_AND_ASSIGN(OpenFileStreamHelper);
 };
 
 LocalFileReader::LocalFileReader(
-    base::MessageLoopProxy* file_thread_proxy,
+    base::TaskRunner* task_runner,
     const FilePath& file_path,
     int64 initial_offset,
     const base::Time& expected_modification_time)
-    : file_thread_proxy_(file_thread_proxy),
+    : task_runner_(task_runner),
       file_path_(file_path),
       initial_offset_(initial_offset),
       expected_modification_time_(expected_modification_time),
       has_pending_open_(false),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
 
 LocalFileReader::~LocalFileReader() {
   if (!stream_impl_.get())
     return;
   stream_impl_->Close(base::Bind(&EmptyCompletionCallback));
 }
 
 int LocalFileReader::Read(net::IOBuffer* buf, int buf_len,
                           const net::CompletionCallback& callback) {
   DCHECK(!has_pending_open_);
   if (stream_impl_.get())
     return stream_impl_->Read(buf, buf_len, callback);
   return Open(base::Bind(&LocalFileReader::DidOpen, weak_factory_.GetWeakPtr(),
                          make_scoped_refptr(buf), buf_len, callback));
 }
 
 int LocalFileReader::GetLength(const net::Int64CompletionCallback& callback) {
   const bool posted = base::FileUtilProxy::GetFileInfo(
-      file_thread_proxy_, file_path_,
+      task_runner_, file_path_,
       base::Bind(&DidGetFileInfoForGetLength, callback,
                  expected_modification_time_));
   DCHECK(posted);
   return net::ERR_IO_PENDING;
 }
 
 int LocalFileReader::Open(const OpenFileStreamCallback& callback) {
   DCHECK(!has_pending_open_);
   DCHECK(!stream_impl_.get());
   has_pending_open_ = true;
-  OpenFileStreamHelper* helper = new OpenFileStreamHelper(file_thread_proxy_);
-  const bool posted = file_thread_proxy_->PostTaskAndReply(
+  OpenFileStreamHelper* helper = new OpenFileStreamHelper(task_runner_);
+  const bool posted = task_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&OpenFileStreamHelper::OpenAndVerifyOnFileThread,
                  base::Unretained(helper), file_path_,
                  expected_modification_time_),
       base::Bind(&OpenFileStreamHelper::OpenStreamOnCallingThread,
                  base::Owned(helper), initial_offset_, callback));
   DCHECK(posted);
   return net::ERR_IO_PENDING;
 }
 
@@ skipping 10 matching lines @@
     return;
   }
   DCHECK(stream_impl.get());
   stream_impl_ = stream_impl.Pass();
   const int read_error = stream_impl_->Read(buf, buf_len, callback);
   if (read_error != net::ERR_IO_PENDING)
     callback.Run(read_error);
 }
 
 }  // namespace webkit_blob