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

content/browser/loader/upload_data_stream_builder_unittest.cc

 // Copyright 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/upload_data_stream_builder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
-#include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/common/resource_request_body.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "storage/browser/blob/blob_data_builder.h"
 #include "storage/browser/blob/blob_storage_context.h"
@@ skipping 46 matching lines @@
   const uint64 kFileLength = 100U;
   const base::Time kFileTime = base::Time::FromDoubleT(999);
   const int64 kIdentifier = 12345;
 
   request_body->AppendBytes(kData, arraysize(kData) - 1);
   request_body->AppendFileRange(base::FilePath(kFilePath),
                                 kFileOffset, kFileLength, kFileTime);
   request_body->set_identifier(kIdentifier);
 
   scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
-      request_body.get(), NULL, NULL,
-      base::ThreadTaskRunnerHandle::Get().get()));
+      request_body.get(), NULL, NULL, base::MessageLoopProxy::current().get()));
 
   EXPECT_EQ(kIdentifier, upload->identifier());
   ASSERT_TRUE(upload->GetElementReaders());
   ASSERT_EQ(request_body->elements()->size(),
             upload->GetElementReaders()->size());
 
   const net::UploadBytesElementReader* r1 =
       (*upload->GetElementReaders())[0]->AsBytesReader();
   ASSERT_TRUE(r1);
   EXPECT_EQ(kData, std::string(r1->bytes(), r1->length()));
@@ skipping 47 matching lines @@
     scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
     request_body->AppendBytes(
         upload_element1.bytes(),
         upload_element1.length());
     request_body->AppendFileRange(
         upload_element2.path(),
         upload_element2.offset(),
         upload_element2.length(),
         upload_element2.expected_modification_time());
 
-    scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get()));
+    scoped_ptr<net::UploadDataStream> upload(
+        UploadDataStreamBuilder::Build(
+            request_body.get(),
+            &blob_storage_context,
+            NULL,
+            base::MessageLoopProxy::current().get()));
 
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(2U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], upload_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], upload_element2));
 
     // Test having only one blob reference that refers to empty blob data.
     request_body = new ResourceRequestBody();
     request_body->AppendBlob(blob_id0);
 
     upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        request_body.get(),
+        &blob_storage_context,
+        NULL,
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(0U, upload->GetElementReaders()->size());
 
     // Test having only one blob reference.
     request_body = new ResourceRequestBody();
     request_body->AppendBlob(blob_id1);
 
     upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        request_body.get(),
+        &blob_storage_context,
+        NULL,
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(2U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], blob_element2));
 
     // Test having one blob reference at the beginning.
     request_body = new ResourceRequestBody();
     request_body->AppendBlob(blob_id1);
     request_body->AppendBytes(
         upload_element1.bytes(),
         upload_element1.length());
     request_body->AppendFileRange(
         upload_element2.path(),
         upload_element2.offset(),
         upload_element2.length(),
         upload_element2.expected_modification_time());
 
     upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        request_body.get(),
+        &blob_storage_context,
+        NULL,
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(4U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], blob_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[2], upload_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[3], upload_element2));
 
     // Test having one blob reference at the end.
     request_body = new ResourceRequestBody();
     request_body->AppendBytes(
         upload_element1.bytes(),
         upload_element1.length());
     request_body->AppendFileRange(
         upload_element2.path(),
         upload_element2.offset(),
         upload_element2.length(),
         upload_element2.expected_modification_time());
     request_body->AppendBlob(blob_id1);
 
-    upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+    upload =
+        UploadDataStreamBuilder::Build(request_body.get(),
+                                       &blob_storage_context,
+                                       NULL,
+                                       base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(4U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], upload_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], upload_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[2], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[3], blob_element2));
 
     // Test having one blob reference in the middle.
     request_body = new ResourceRequestBody();
     request_body->AppendBytes(
         upload_element1.bytes(),
         upload_element1.length());
     request_body->AppendBlob(blob_id1);
     request_body->AppendFileRange(
         upload_element2.path(),
         upload_element2.offset(),
         upload_element2.length(),
         upload_element2.expected_modification_time());
 
     upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        request_body.get(),
+        &blob_storage_context,
+        NULL,
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(4U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], upload_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[2], blob_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[3], upload_element2));
 
     // Test having multiple blob references.
     request_body = new ResourceRequestBody();
     request_body->AppendBlob(blob_id1);
     request_body->AppendBytes(
         upload_element1.bytes(),
         upload_element1.length());
     request_body->AppendBlob(blob_id1);
     request_body->AppendBlob(blob_id1);
     request_body->AppendFileRange(
         upload_element2.path(),
         upload_element2.offset(),
         upload_element2.length(),
         upload_element2.expected_modification_time());
 
     upload = UploadDataStreamBuilder::Build(
-        request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        request_body.get(),
+        &blob_storage_context,
+        NULL,
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     ASSERT_EQ(8U, upload->GetElementReaders()->size());
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[0], blob_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[1], blob_element2));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[2], upload_element1));
     EXPECT_TRUE(AreElementsEqual(
         *(*upload->GetElementReaders())[3], blob_element1));
@@ skipping 30 matching lines @@
     blob_data_builder->AppendFile(test_blob_path, 0, kZeroLength, blob_time);
     scoped_ptr<BlobDataHandle> handle =
         blob_storage_context.AddFinishedBlob(blob_data_builder.get());
 
     ResourceRequestBody::Element blob_element;
     blob_element.SetToFilePathRange(test_blob_path, 0, kZeroLength, blob_time);
 
     scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
     scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
         request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get()));
+        base::MessageLoopProxy::current().get()));
 
     request_body = new ResourceRequestBody();
     request_body->AppendBlob(blob_id);
     request_body->AppendBlob(blob_id);
     request_body->AppendBlob(blob_id);
 
     upload = UploadDataStreamBuilder::Build(
         request_body.get(), &blob_storage_context, NULL,
-        base::ThreadTaskRunnerHandle::Get().get());
+        base::MessageLoopProxy::current().get());
     ASSERT_TRUE(upload->GetElementReaders());
     const auto& readers = *upload->GetElementReaders();
     ASSERT_EQ(3U, readers.size());
     EXPECT_TRUE(AreElementsEqual(*readers[0], blob_element));
     EXPECT_TRUE(AreElementsEqual(*readers[1], blob_element));
     EXPECT_TRUE(AreElementsEqual(*readers[2], blob_element));
 
     net::TestCompletionCallback init_callback;
     ASSERT_EQ(net::ERR_IO_PENDING, upload->Init(init_callback.callback()));
     EXPECT_EQ(net::OK, init_callback.WaitForResult());
@@ skipping 10 matching lines @@
     int result =
         upload->Read(io_buffer.get(), kBufferLength, read_callback.callback());
     EXPECT_EQ(static_cast<int>(kZeroLength), read_callback.GetResult(result));
 
     base::DeleteFile(test_blob_path, false);
   }
   // Clean up for ASAN.
   base::RunLoop().RunUntilIdle();
 }
 }  // namespace content