summaryrefslogtreecommitdiffstats
path: root/content/browser/loader
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/loader')
-rw-r--r--content/browser/loader/buffered_resource_handler.cc5
-rw-r--r--content/browser/loader/resource_dispatcher_host_unittest.cc8
-rw-r--r--content/browser/loader/resource_loader.cc38
-rw-r--r--content/browser/loader/resource_loader_unittest.cc19
-rw-r--r--content/browser/loader/upload_data_stream_builder_unittest.cc57
5 files changed, 57 insertions, 70 deletions
diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
index 2d4e088..a160eed 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -7,9 +7,12 @@
#include <vector>
#include "base/bind.h"
+#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
+#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
+#include "base/thread_task_runner_handle.h"
#include "components/mime_util/mime_util.h"
#include "content/browser/download/download_resource_handler.h"
#include "content/browser/download/download_stats.h"
@@ -196,7 +199,7 @@ void BufferedResourceHandler::Resume() {
NOTREACHED();
break;
case STATE_REPLAYING:
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&BufferedResourceHandler::CallReplayReadCompleted,
weak_ptr_factory_.GetWeakPtr()));
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index c3b4eca..5df1109 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -8,13 +8,15 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/location.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/shared_memory.h"
-#include "base/message_loop/message_loop.h"
#include "base/pickle.h"
#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
+#include "base/thread_task_runner_handle.h"
#include "content/browser/browser_thread_impl.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "content/browser/loader/cross_site_resource_handler.h"
@@ -442,7 +444,7 @@ class URLRequestBigJob : public net::URLRequestSimpleJob {
}
base::TaskRunner* GetTaskRunner() const override {
- return base::MessageLoopProxy::current().get();
+ return base::ThreadTaskRunnerHandle::Get().get();
}
private:
@@ -922,7 +924,7 @@ class ResourceDispatcherHostTest : public testing::Test,
scoped_ptr<IPC::Message> ack(
new ResourceHostMsg_DataReceived_ACK(request_id));
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&GenerateIPCMessage, filter_, base::Passed(&ack)));
}
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index f3be2a8..63b9f9c 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -5,9 +5,11 @@
#include "content/browser/loader/resource_loader.h"
#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
+#include "base/location.h"
#include "base/metrics/histogram.h"
#include "base/profiler/scoped_tracker.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "content/browser/appcache/appcache_interceptor.h"
#include "content/browser/child_process_security_policy_impl.h"
@@ -465,23 +467,20 @@ void ResourceLoader::Resume() {
request_->FollowDeferredRedirect();
break;
case DEFERRED_READ:
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&ResourceLoader::ResumeReading,
- weak_ptr_factory_.GetWeakPtr()));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&ResourceLoader::ResumeReading,
+ weak_ptr_factory_.GetWeakPtr()));
break;
case DEFERRED_RESPONSE_COMPLETE:
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&ResourceLoader::ResponseCompleted,
- weak_ptr_factory_.GetWeakPtr()));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted,
+ weak_ptr_factory_.GetWeakPtr()));
break;
case DEFERRED_FINISH:
// Delay self-destruction since we don't know how we were reached.
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&ResourceLoader::CallDidFinishLoading,
- weak_ptr_factory_.GetWeakPtr()));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&ResourceLoader::CallDidFinishLoading,
+ weak_ptr_factory_.GetWeakPtr()));
break;
}
}
@@ -545,10 +544,9 @@ void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) {
// If the request isn't in flight, then we won't get an asynchronous
// notification from the request, so we have to signal ourselves to finish
// this request.
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&ResourceLoader::ResponseCompleted,
- weak_ptr_factory_.GetWeakPtr()));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted,
+ weak_ptr_factory_.GetWeakPtr()));
}
}
@@ -623,12 +621,10 @@ void ResourceLoader::StartReading(bool is_continuation) {
} else {
// Else, trigger OnReadCompleted asynchronously to avoid starving the IO
// thread in case the URLRequest can provide data synchronously.
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&ResourceLoader::OnReadCompleted,
- weak_ptr_factory_.GetWeakPtr(),
- request_.get(),
- bytes_read));
+ weak_ptr_factory_.GetWeakPtr(), request_.get(), bytes_read));
}
}
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 16cab3a..7b4000e 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -6,9 +6,11 @@
#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"
@@ -104,7 +106,7 @@ class LoaderDestroyingCertStore : public net::ClientCertStore {
net::CertificateList* selected_certs,
const base::Closure& callback) override {
// Don't destroy |loader_| while it's on the stack.
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&LoaderDestroyingCertStore::DoCallback,
base::Unretained(loader_), callback));
}
@@ -135,7 +137,7 @@ class MockClientCertURLRequestJob : public net::URLRequestTestJob {
scoped_refptr<net::SSLCertRequestInfo> cert_request_info(
new net::SSLCertRequestInfo);
cert_request_info->cert_authorities = test_authorities();
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&MockClientCertURLRequestJob::NotifyCertificateRequested,
this, cert_request_info));
@@ -407,7 +409,7 @@ class NonChunkedUploadDataStream : public net::UploadDataStream {
void CreateTemporaryError(
base::File::Error error,
const CreateTemporaryFileStreamCallback& callback) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, error, base::Passed(scoped_ptr<net::FileStream>()),
scoped_refptr<ShareableFileReference>()));
@@ -779,7 +781,7 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
// Create mock file streams and a ShareableFileReference.
scoped_ptr<net::testing::MockFileStream> file_stream(
new net::testing::MockFileStream(file.Pass(),
- base::MessageLoopProxy::current()));
+ base::ThreadTaskRunnerHandle::Get()));
file_stream_ = file_stream.get();
deletable_file_ = ShareableFileReference::GetOrCreate(
temp_path_,
@@ -802,10 +804,9 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
void PostCallback(
scoped_ptr<net::FileStream> file_stream,
const CreateTemporaryFileStreamCallback& callback) {
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, base::File::FILE_OK,
- base::Passed(&file_stream), deletable_file_));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(callback, base::File::FILE_OK,
+ base::Passed(&file_stream), deletable_file_));
}
base::FilePath temp_path_;
diff --git a/content/browser/loader/upload_data_stream_builder_unittest.cc b/content/browser/loader/upload_data_stream_builder_unittest.cc
index 57161ea..174a89b 100644
--- a/content/browser/loader/upload_data_stream_builder_unittest.cc
+++ b/content/browser/loader/upload_data_stream_builder_unittest.cc
@@ -9,9 +9,8 @@
#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"
@@ -78,7 +77,8 @@ TEST(UploadDataStreamBuilderTest, CreateUploadDataStreamWithoutBlob) {
request_body->set_identifier(kIdentifier);
scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
- request_body.get(), NULL, NULL, base::MessageLoopProxy::current().get()));
+ request_body.get(), NULL, NULL,
+ base::ThreadTaskRunnerHandle::Get().get()));
EXPECT_EQ(kIdentifier, upload->identifier());
ASSERT_TRUE(upload->GetElementReaders());
@@ -146,12 +146,9 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.length(),
upload_element2.expected_modification_time());
- scoped_ptr<net::UploadDataStream> upload(
- UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get()));
+ scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get()));
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(2U, upload->GetElementReaders()->size());
@@ -165,10 +162,8 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
request_body->AppendBlob(blob_id0);
upload = UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(0U, upload->GetElementReaders()->size());
@@ -177,10 +172,8 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
request_body->AppendBlob(blob_id1);
upload = UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(2U, upload->GetElementReaders()->size());
EXPECT_TRUE(AreElementsEqual(
@@ -201,10 +194,8 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
upload = UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(4U, upload->GetElementReaders()->size());
EXPECT_TRUE(AreElementsEqual(
@@ -228,11 +219,9 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
request_body->AppendBlob(blob_id1);
- upload =
- UploadDataStreamBuilder::Build(request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ upload = UploadDataStreamBuilder::Build(
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(4U, upload->GetElementReaders()->size());
EXPECT_TRUE(AreElementsEqual(
@@ -257,10 +246,8 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
upload = UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(4U, upload->GetElementReaders()->size());
EXPECT_TRUE(AreElementsEqual(
@@ -287,10 +274,8 @@ TEST(UploadDataStreamBuilderTest, ResolveBlobAndCreateUploadDataStream) {
upload_element2.expected_modification_time());
upload = UploadDataStreamBuilder::Build(
- request_body.get(),
- &blob_storage_context,
- NULL,
- base::MessageLoopProxy::current().get());
+ request_body.get(), &blob_storage_context, NULL,
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
ASSERT_EQ(8U, upload->GetElementReaders()->size());
EXPECT_TRUE(AreElementsEqual(
@@ -341,7 +326,7 @@ TEST(UploadDataStreamBuilderTest,
scoped_refptr<ResourceRequestBody> request_body(new ResourceRequestBody());
scoped_ptr<net::UploadDataStream> upload(UploadDataStreamBuilder::Build(
request_body.get(), &blob_storage_context, NULL,
- base::MessageLoopProxy::current().get()));
+ base::ThreadTaskRunnerHandle::Get().get()));
request_body = new ResourceRequestBody();
request_body->AppendBlob(blob_id);
@@ -350,7 +335,7 @@ TEST(UploadDataStreamBuilderTest,
upload = UploadDataStreamBuilder::Build(
request_body.get(), &blob_storage_context, NULL,
- base::MessageLoopProxy::current().get());
+ base::ThreadTaskRunnerHandle::Get().get());
ASSERT_TRUE(upload->GetElementReaders());
const auto& readers = *upload->GetElementReaders();
ASSERT_EQ(3U, readers.size());
generated by cgit v1.1 at 2025-05-12 19:08:15 +0000