Index: content/child/url_loader_client_impl_unittest.cc |
diff --git a/content/child/url_loader_client_impl_unittest.cc b/content/child/url_loader_client_impl_unittest.cc |
index 61b62c8651344771c5fc2150aaf1e85620f246a8..fddc7de1e638ec0618c298e02f646ecd2381b6c6 100644 |
--- a/content/child/url_loader_client_impl_unittest.cc |
+++ b/content/child/url_loader_client_impl_unittest.cc |
@@ -53,6 +53,7 @@ class URLLoaderClientImplTest : public ::testing::Test, |
void CreateLoaderAndStart(mojom::URLLoaderAssociatedRequest request, |
int32_t routing_id, |
int32_t request_id, |
+ int32_t options, |
const ResourceRequest& url_request, |
mojom::URLLoaderClientPtr client) override { |
url_loader_client_ = std::move(client); |
@@ -86,7 +87,8 @@ class URLLoaderClientImplTest : public ::testing::Test, |
TEST_F(URLLoaderClientImplTest, OnReceiveResponse) { |
ResourceResponseHead response_head; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
EXPECT_FALSE(request_peer_context_.received_response); |
base::RunLoop().RunUntilIdle(); |
@@ -96,7 +98,8 @@ TEST_F(URLLoaderClientImplTest, OnReceiveResponse) { |
TEST_F(URLLoaderClientImplTest, ResponseBody) { |
ResourceResponseHead response_head; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
EXPECT_FALSE(request_peer_context_.received_response); |
base::RunLoop().RunUntilIdle(); |
@@ -130,7 +133,8 @@ TEST_F(URLLoaderClientImplTest, OnReceiveRedirect) { |
TEST_F(URLLoaderClientImplTest, OnDataDownloaded) { |
ResourceResponseHead response_head; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnDataDownloaded(8, 13); |
url_loader_client_->OnDataDownloaded(2, 1); |
@@ -148,7 +152,8 @@ TEST_F(URLLoaderClientImplTest, OnReceiveCachedMetadata) { |
std::vector<uint8_t> metadata; |
metadata.push_back('a'); |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnReceiveCachedMetadata(metadata); |
EXPECT_FALSE(request_peer_context_.received_response); |
@@ -162,7 +167,8 @@ TEST_F(URLLoaderClientImplTest, OnReceiveCachedMetadata) { |
TEST_F(URLLoaderClientImplTest, OnTransferSizeUpdated) { |
ResourceResponseHead response_head; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnTransferSizeUpdated(4); |
url_loader_client_->OnTransferSizeUpdated(4); |
@@ -177,7 +183,8 @@ TEST_F(URLLoaderClientImplTest, OnCompleteWithoutResponseBody) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnComplete(completion_status); |
EXPECT_FALSE(request_peer_context_.received_response); |
@@ -191,7 +198,8 @@ TEST_F(URLLoaderClientImplTest, OnCompleteWithResponseBody) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
url_loader_client_->OnStartLoadingResponseBody( |
std::move(data_pipe.consumer_handle)); |
@@ -226,7 +234,8 @@ TEST_F(URLLoaderClientImplTest, OnCompleteShouldBeTheLastMessage) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
url_loader_client_->OnStartLoadingResponseBody( |
std::move(data_pipe.consumer_handle)); |
@@ -259,7 +268,8 @@ TEST_F(URLLoaderClientImplTest, CancelOnReceiveResponse) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
url_loader_client_->OnStartLoadingResponseBody( |
std::move(data_pipe.consumer_handle)); |
@@ -289,7 +299,8 @@ TEST_F(URLLoaderClientImplTest, CancelOnReceiveData) { |
ASSERT_EQ(MOJO_RESULT_OK, result); |
EXPECT_EQ(5u, size); |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnStartLoadingResponseBody( |
std::move(data_pipe.consumer_handle)); |
url_loader_client_->OnComplete(completion_status); |
@@ -310,7 +321,8 @@ TEST_F(URLLoaderClientImplTest, Defer) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnComplete(completion_status); |
EXPECT_FALSE(request_peer_context_.received_response); |
@@ -335,7 +347,8 @@ TEST_F(URLLoaderClientImplTest, DeferWithResponseBody) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
uint32_t size = 5; |
MojoResult result = |
@@ -377,7 +390,8 @@ TEST_F(URLLoaderClientImplTest, DeferWithTransferSizeUpdated) { |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
uint32_t size = 5; |
MojoResult result = |
@@ -426,7 +440,8 @@ TEST_F(URLLoaderClientImplTest, SetDeferredDuringFlushingDeferredMessage) { |
ResourceRequestCompletionStatus completion_status; |
url_loader_client_->OnReceiveRedirect(redirect_info, response_head); |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
mojo::DataPipe data_pipe(DataPipeOptions()); |
uint32_t size = 5; |
MojoResult result = |
@@ -488,7 +503,8 @@ TEST_F(URLLoaderClientImplTest, |
ResourceResponseHead response_head; |
ResourceRequestCompletionStatus completion_status; |
- url_loader_client_->OnReceiveResponse(response_head, nullptr); |
+ url_loader_client_->OnReceiveResponse( |
+ response_head, base::Optional<net::SSLInfo>(), nullptr); |
url_loader_client_->OnTransferSizeUpdated(4); |
url_loader_client_->OnComplete(completion_status); |