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

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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 "content/browser/loader/resource_loader.h"
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
-#include "base/location.h"
 #include "base/macros.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
-#include "base/single_thread_task_runner.h"
-#include "base/thread_task_runner_handle.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/loader/redirect_to_file_resource_handler.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 75 matching lines @@
   // reset |loader| and then call the callback. The caller is responsible for
   // ensuring the pointers remain valid until the process is complete.
   explicit LoaderDestroyingCertStore(scoped_ptr<ResourceLoader>* loader)
       : loader_(loader) {}
 
   // net::ClientCertStore:
   void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info,
                       net::CertificateList* selected_certs,
                       const base::Closure& callback) override {
     // Don't destroy |loader_| while it's on the stack.
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&LoaderDestroyingCertStore::DoCallback,
                               base::Unretained(loader_), callback));
   }
 
  private:
   static void DoCallback(scoped_ptr<ResourceLoader>* loader,
                          const base::Closure& callback) {
     loader->reset();
     callback.Run();
   }
@@ skipping 10 matching lines @@
 
   static std::vector<std::string> test_authorities() {
     return std::vector<std::string>(1, "dummy");
   }
 
   // net::URLRequestTestJob:
   void Start() override {
     scoped_refptr<net::SSLCertRequestInfo> cert_request_info(
         new net::SSLCertRequestInfo);
     cert_request_info->cert_authorities = test_authorities();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&MockClientCertURLRequestJob::NotifyCertificateRequested,
                    this, cert_request_info));
   }
 
   void ContinueWithCertificate(net::X509Certificate* cert) override {
     net::URLRequestTestJob::Start();
   }
 
  private:
@@ skipping 251 matching lines @@
   net::ChunkedUploadDataStream stream_;
   uint64 size_;
 
   DISALLOW_COPY_AND_ASSIGN(NonChunkedUploadDataStream);
 };
 
 // Fails to create a temporary file with the given error.
 void CreateTemporaryError(
     base::File::Error error,
     const CreateTemporaryFileStreamCallback& callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, error, base::Passed(scoped_ptr<net::FileStream>()),
                  scoped_refptr<ShareableFileReference>()));
 }
 
 }  // namespace
 
 class ResourceLoaderTest : public testing::Test,
                            public ResourceLoaderDelegate {
  protected:
@@ skipping 351 matching lines @@
     // Make a temporary file.
     CHECK(base::CreateTemporaryFile(&temp_path_));
     int flags = base::File::FLAG_WRITE | base::File::FLAG_TEMPORARY |
                 base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_ASYNC;
     base::File file(temp_path_, flags);
     CHECK(file.IsValid());
 
     // Create mock file streams and a ShareableFileReference.
     scoped_ptr<net::testing::MockFileStream> file_stream(
         new net::testing::MockFileStream(file.Pass(),
-                                         base::ThreadTaskRunnerHandle::Get()));
+                                         base::MessageLoopProxy::current()));
     file_stream_ = file_stream.get();
     deletable_file_ = ShareableFileReference::GetOrCreate(
         temp_path_,
         ShareableFileReference::DELETE_ON_FINAL_RELEASE,
         BrowserThread::GetMessageLoopProxyForThread(
             BrowserThread::FILE).get());
 
     // Inject them into the handler.
     scoped_ptr<RedirectToFileResourceHandler> handler(
         new RedirectToFileResourceHandler(leaf_handler.Pass(), request));
     redirect_to_file_resource_handler_ = handler.get();
     handler->SetCreateTemporaryFileStreamFunctionForTesting(
         base::Bind(&ResourceLoaderRedirectToFileTest::PostCallback,
                    base::Unretained(this),
                    base::Passed(&file_stream)));
     return handler.Pass();
   }
 
  private:
   void PostCallback(
       scoped_ptr<net::FileStream> file_stream,
       const CreateTemporaryFileStreamCallback& callback) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, base::File::FILE_OK,
-                              base::Passed(&file_stream), deletable_file_));
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(callback, base::File::FILE_OK,
+                   base::Passed(&file_stream), deletable_file_));
   }
 
   base::FilePath temp_path_;
   scoped_refptr<ShareableFileReference> deletable_file_;
   // These are owned by the ResourceLoader.
   net::testing::MockFileStream* file_stream_;
   RedirectToFileResourceHandler* redirect_to_file_resource_handler_;
 };
 
 // Tests that a RedirectToFileResourceHandler works and forwards everything
@@ skipping 167 matching lines @@
   ASSERT_TRUE(base::ReadFileToString(temp_path(), &contents));
   EXPECT_EQ(test_data(), contents);
 
   // Release the loader. The file should be gone now.
   ReleaseLoader();
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(base::PathExists(temp_path()));
 }
 
 }  // namespace content