Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"

content/browser/database_quota_client_unittest.cc

Index: content/browser/database_quota_client_unittest.cc
diff --git a/content/browser/database_quota_client_unittest.cc b/content/browser/database_quota_client_unittest.cc
index 3c2c6f314709e5e74e82a9a9e68083c0f6f8ad59..a439b5176d4079707fc058a345fec6b2615bb766 100644
--- a/content/browser/database_quota_client_unittest.cc
+++ b/content/browser/database_quota_client_unittest.cc
@@ -6,11 +6,9 @@
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
-#include "base/location.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/thread_task_runner_handle.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "storage/browser/database/database_quota_client.h"
@@ -74,9 +72,10 @@ class MockDatabaseTracker : public DatabaseTracker {
                           const net::CompletionCallback& callback) override {
     ++delete_called_count_;
     if (async_delete()) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE, base::Bind(&MockDatabaseTracker::AsyncDeleteDataForOrigin,
-                                this, callback));
+      base::MessageLoopProxy::current()->PostTask(
+          FROM_HERE,
+          base::Bind(&MockDatabaseTracker::AsyncDeleteDataForOrigin, this,
+                     callback));
       return net::ERR_IO_PENDING;
     }
     return net::OK;
@@ -208,7 +207,7 @@ class DatabaseQuotaClientTest : public testing::Test {
 
 
 TEST_F(DatabaseQuotaClientTest, GetOriginUsage) {
-  DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
+  DatabaseQuotaClient client(base::MessageLoopProxy::current().get(),
                              mock_tracker());
 
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
@@ -223,7 +222,7 @@ TEST_F(DatabaseQuotaClientTest, GetOriginUsage) {
 }
 
 TEST_F(DatabaseQuotaClientTest, GetOriginsForHost) {
-  DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
+  DatabaseQuotaClient client(base::MessageLoopProxy::current().get(),
                              mock_tracker());
 
   EXPECT_EQ(kOriginA.host(), kOriginB.host());
@@ -248,7 +247,7 @@ TEST_F(DatabaseQuotaClientTest, GetOriginsForHost) {
 }
 
 TEST_F(DatabaseQuotaClientTest, GetOriginsForType) {
-  DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
+  DatabaseQuotaClient client(base::MessageLoopProxy::current().get(),
                              mock_tracker());
 
   EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty());
@@ -263,7 +262,7 @@ TEST_F(DatabaseQuotaClientTest, GetOriginsForType) {
 }
 
 TEST_F(DatabaseQuotaClientTest, DeleteOriginData) {
-  DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
+  DatabaseQuotaClient client(base::MessageLoopProxy::current().get(),
                              mock_tracker());
 
   // Perm deletions are short circuited in the Client and