summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/loader/url_loader_client_impl_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/loader/url_loader_client_impl_unittest.cc')
-rw-r--r--chromium/content/renderer/loader/url_loader_client_impl_unittest.cc41
1 files changed, 20 insertions, 21 deletions
diff --git a/chromium/content/renderer/loader/url_loader_client_impl_unittest.cc b/chromium/content/renderer/loader/url_loader_client_impl_unittest.cc
index b71a08ed8b7..9c00707535e 100644
--- a/chromium/content/renderer/loader/url_loader_client_impl_unittest.cc
+++ b/chromium/content/renderer/loader/url_loader_client_impl_unittest.cc
@@ -5,10 +5,9 @@
#include "content/renderer/loader/url_loader_client_impl.h"
#include <vector>
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
-#include "content/common/weak_wrapper_shared_url_loader_factory.h"
+#include "content/public/common/weak_wrapper_shared_url_loader_factory.h"
#include "content/renderer/loader/resource_dispatcher.h"
#include "content/renderer/loader/test_request_peer.h"
#include "mojo/public/cpp/bindings/binding.h"
@@ -17,7 +16,7 @@
#include "net/url_request/redirect_info.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/scheduler/test/renderer_scheduler_test_support.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
namespace content {
@@ -27,8 +26,8 @@ class URLLoaderClientImplTest : public ::testing::Test,
URLLoaderClientImplTest() : dispatcher_(new ResourceDispatcher()) {
request_id_ = dispatcher_->StartAsync(
std::make_unique<network::ResourceRequest>(), 0,
- blink::scheduler::GetSingleThreadTaskRunnerForTesting(), url::Origin(),
- TRAFFIC_ANNOTATION_FOR_TESTS, false,
+ blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
+ TRAFFIC_ANNOTATION_FOR_TESTS, false, false,
std::make_unique<TestRequestPeer>(dispatcher_.get(),
&request_peer_context_),
base::MakeRefCounted<WeakWrapperSharedURLLoaderFactory>(this),
@@ -79,7 +78,7 @@ class URLLoaderClientImplTest : public ::testing::Test,
TEST_F(URLLoaderClientImplTest, OnReceiveResponse) {
network::ResourceResponseHead response_head;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
EXPECT_FALSE(request_peer_context_.received_response);
base::RunLoop().RunUntilIdle();
@@ -89,7 +88,7 @@ TEST_F(URLLoaderClientImplTest, OnReceiveResponse) {
TEST_F(URLLoaderClientImplTest, ResponseBody) {
network::ResourceResponseHead response_head;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
EXPECT_FALSE(request_peer_context_.received_response);
base::RunLoop().RunUntilIdle();
@@ -122,7 +121,7 @@ TEST_F(URLLoaderClientImplTest, OnReceiveRedirect) {
TEST_F(URLLoaderClientImplTest, OnDataDownloaded) {
network::ResourceResponseHead response_head;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnDataDownloaded(8, 13);
url_loader_client_->OnDataDownloaded(2, 1);
@@ -140,7 +139,7 @@ TEST_F(URLLoaderClientImplTest, OnReceiveCachedMetadata) {
std::vector<uint8_t> metadata;
metadata.push_back('a');
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnReceiveCachedMetadata(metadata);
EXPECT_FALSE(request_peer_context_.received_response);
@@ -154,7 +153,7 @@ TEST_F(URLLoaderClientImplTest, OnReceiveCachedMetadata) {
TEST_F(URLLoaderClientImplTest, OnTransferSizeUpdated) {
network::ResourceResponseHead response_head;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnTransferSizeUpdated(4);
url_loader_client_->OnTransferSizeUpdated(4);
@@ -169,7 +168,7 @@ TEST_F(URLLoaderClientImplTest, OnCompleteWithoutResponseBody) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnComplete(status);
EXPECT_FALSE(request_peer_context_.received_response);
@@ -183,7 +182,7 @@ TEST_F(URLLoaderClientImplTest, OnCompleteWithResponseBody) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
url_loader_client_->OnStartLoadingResponseBody(
std::move(data_pipe.consumer_handle));
@@ -217,7 +216,7 @@ TEST_F(URLLoaderClientImplTest, OnCompleteShouldBeTheLastMessage) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
url_loader_client_->OnStartLoadingResponseBody(
std::move(data_pipe.consumer_handle));
@@ -249,7 +248,7 @@ TEST_F(URLLoaderClientImplTest, CancelOnReceiveResponse) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
url_loader_client_->OnStartLoadingResponseBody(
std::move(data_pipe.consumer_handle));
@@ -278,7 +277,7 @@ TEST_F(URLLoaderClientImplTest, CancelOnReceiveData) {
ASSERT_EQ(MOJO_RESULT_OK, result);
EXPECT_EQ(5u, size);
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnStartLoadingResponseBody(
std::move(data_pipe.consumer_handle));
url_loader_client_->OnComplete(status);
@@ -299,7 +298,7 @@ TEST_F(URLLoaderClientImplTest, Defer) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnComplete(status);
EXPECT_FALSE(request_peer_context_.received_response);
@@ -324,7 +323,7 @@ TEST_F(URLLoaderClientImplTest, DeferWithResponseBody) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
uint32_t size = 5;
MojoResult result = data_pipe.producer_handle->WriteData(
@@ -365,7 +364,7 @@ TEST_F(URLLoaderClientImplTest, DeferWithTransferSizeUpdated) {
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
uint32_t size = 5;
MojoResult result = data_pipe.producer_handle->WriteData(
@@ -413,7 +412,7 @@ TEST_F(URLLoaderClientImplTest, SetDeferredDuringFlushingDeferredMessage) {
network::URLLoaderCompletionStatus status;
url_loader_client_->OnReceiveRedirect(redirect_info, response_head);
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
mojo::DataPipe data_pipe(DataPipeOptions());
uint32_t size = 5;
MojoResult result = data_pipe.producer_handle->WriteData(
@@ -474,7 +473,7 @@ TEST_F(URLLoaderClientImplTest,
network::ResourceResponseHead response_head;
network::URLLoaderCompletionStatus status;
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnTransferSizeUpdated(4);
url_loader_client_->OnComplete(status);
@@ -523,7 +522,7 @@ TEST_F(URLLoaderClientImplTest, CancelOnReceiveDataWhileFlushing) {
ASSERT_EQ(MOJO_RESULT_OK, result);
EXPECT_EQ(5u, size);
- url_loader_client_->OnReceiveResponse(response_head, base::nullopt, nullptr);
+ url_loader_client_->OnReceiveResponse(response_head, nullptr);
url_loader_client_->OnStartLoadingResponseBody(
std::move(data_pipe.consumer_handle));
url_loader_client_->OnComplete(status);
View Lorry Controller Status