Revert of content/common: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

content/common/database_connections_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "storage/common/database/database_connections.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 using storage::DatabaseConnections;
 using storage::DatabaseConnectionsWrapper;
 
 namespace content {
 
 namespace {
 
 void RemoveConnectionTask(
     const std::string& origin_id, const base::string16& database_name,
     scoped_refptr<DatabaseConnectionsWrapper> obj,
     bool* did_task_execute) {
   *did_task_execute = true;
   obj->RemoveOpenConnection(origin_id, database_name);
 }
 
 void ScheduleRemoveConnectionTask(
     base::Thread* thread,  const std::string& origin_id,
     const base::string16& database_name,
     scoped_refptr<DatabaseConnectionsWrapper> obj,
     bool* did_task_execute) {
-  thread->task_runner()->PostTask(
-      FROM_HERE, base::Bind(&RemoveConnectionTask, origin_id, database_name,
-                            obj, did_task_execute));
+  thread->message_loop()->PostTask(
+      FROM_HERE,
+      base::Bind(&RemoveConnectionTask, origin_id, database_name, obj,
+                 did_task_execute));
 }
 
 }  // anonymous namespace
 
 TEST(DatabaseConnectionsTest, DatabaseConnectionsTest) {
   const std::string kOriginId("origin_id");
   const base::string16 kName(ASCIIToUTF16("database_name"));
   const base::string16 kName2(ASCIIToUTF16("database_name2"));
   const int64 kSize = 1000;
 
@@ skipping 67 matching lines @@
   obj->RemoveOpenConnection(kOriginId, kName);
   EXPECT_TRUE(obj->HasOpenConnections());
   obj->RemoveOpenConnection(kOriginId, kName);
   EXPECT_FALSE(obj->HasOpenConnections());
   obj->WaitForAllDatabasesToClose();  // should return immediately
 
   // Test WaitForAllDatabasesToClose with the last connection
   // being removed on the current thread.
   obj->AddOpenConnection(kOriginId, kName);
   bool did_task_execute = false;
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&RemoveConnectionTask, kOriginId, kName, obj,
-                            &did_task_execute));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&RemoveConnectionTask, kOriginId, kName, obj,
+                 &did_task_execute));
   obj->WaitForAllDatabasesToClose();  // should return after the task executes
   EXPECT_TRUE(did_task_execute);
   EXPECT_FALSE(obj->HasOpenConnections());
 
   // Test WaitForAllDatabasesToClose with the last connection
   // being removed on another thread.
   obj->AddOpenConnection(kOriginId, kName);
   base::Thread thread("WrapperTestThread");
   thread.Start();
   did_task_execute = false;
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId,
-                            kName, obj, &did_task_execute));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId, kName, obj,
+                 &did_task_execute));
   obj->WaitForAllDatabasesToClose();  // should return after the task executes
   EXPECT_TRUE(did_task_execute);
   EXPECT_FALSE(obj->HasOpenConnections());
 }
 
 }  // namespace content