Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / net / disk_cache / blockfile / in_flight_io.cc

diff --git a/src/net/disk_cache/blockfile/in_flight_io.cc b/src/net/disk_cache/blockfile/in_flight_io.cc
index 6e9485d..9ada7c5 100644 (file)
--- a/src/net/disk_cache/blockfile/in_flight_io.cc
+++ b/src/net/disk_cache/blockfile/in_flight_io.cc
@@ -7,6 +7,9 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
+#include "base/task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace disk_cache {
@@ -34,8 +37,9 @@ BackgroundIO::~BackgroundIO() {
 // ---------------------------------------------------------------------------
 
 InFlightIO::InFlightIO()
-    : callback_thread_(base::MessageLoopProxy::current()),
-      running_(false), single_thread_(false) {
+    : callback_task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      running_(false),
+      single_thread_(false) {
 }
 
 InFlightIO::~InFlightIO() {
@@ -69,15 +73,14 @@ void InFlightIO::DropPendingIO() {
 // Runs on a background thread.
 void InFlightIO::OnIOComplete(BackgroundIO* operation) {
 #ifndef NDEBUG
-  if (callback_thread_->BelongsToCurrentThread()) {
+  if (callback_task_runner_->RunsTasksOnCurrentThread()) {
     DCHECK(single_thread_ || !running_);
     single_thread_ = true;
   }
 #endif
 
-  callback_thread_->PostTask(FROM_HERE,
-                             base::Bind(&BackgroundIO::OnIOSignalled,
-                                        operation));
+  callback_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&BackgroundIO::OnIOSignalled, operation));
   operation->io_completed()->Signal();
 }
 
@@ -103,7 +106,7 @@ void InFlightIO::InvokeCallback(BackgroundIO* operation, bool cancel_task) {
 
 // Runs on the primary thread.
 void InFlightIO::OnOperationPosted(BackgroundIO* operation) {
-  DCHECK(callback_thread_->BelongsToCurrentThread());
+  DCHECK(callback_task_runner_->RunsTasksOnCurrentThread());
   io_list_.insert(make_scoped_refptr(operation));
 }