content/browser/loader/url_loader_factory_impl_unittest.cc - Issue 2893233002: Network traffic annotation added to URLLoaderImpl.

Unified Diff: content/browser/loader/url_loader_factory_impl_unittest.cc

Issue 2893233002: Network traffic annotation added to URLLoaderImpl. (Closed)

Patch Set: Mutable network traffic annotation added. Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« cc/ipc/cc_param_traits.cc ('K') | « content/browser/loader/url_loader_factory_impl.cc ('k') | content/browser/service_worker/service_worker_fetch_dispatcher.cc » ('j') | content/common/url_loader_factory.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/loader/url_loader_factory_impl_unittest.cc

diff --git a/content/browser/loader/url_loader_factory_impl_unittest.cc b/content/browser/loader/url_loader_factory_impl_unittest.cc

index 80a4a93db6f1fe6ca5ba9c5679954ce2e3f7eb8e..1c1ce2e1d69e9636b92b1961d3ea225f9278dc4a 100644

--- a/content/browser/loader/url_loader_factory_impl_unittest.cc

+++ b/content/browser/loader/url_loader_factory_impl_unittest.cc

@@ -51,6 +51,7 @@

#include "net/test/url_request/url_request_failed_job.h"

#include "net/test/url_request/url_request_mock_http_job.h"

#include "net/test/url_request/url_request_slow_download_job.h"

+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"

#include "net/url_request/url_request_filter.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"

@@ -167,7 +168,8 @@ TEST_P(URLLoaderFactoryImplTest, GetResponse) {

request.request_initiator = url::Origin();

factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,

kRequestId, mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ client.CreateInterfacePtr(),

+ TRAFFIC_ANNOTATION_FOR_TESTS);

ASSERT_FALSE(client.has_received_response());

ASSERT_FALSE(client.response_body().is_valid());

@@ -241,9 +243,9 @@ TEST_P(URLLoaderFactoryImplTest, GetFailedResponse) {

request.resource_type = RESOURCE_TYPE_XHR;

// Need to set |request_initiator| for non main frame type request.

request.request_initiator = url::Origin();

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), 2, 1,

- mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), 2, 1, mojom::kURLLoadOptionNone, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

client.RunUntilComplete();

ASSERT_FALSE(client.has_received_response());

@@ -270,9 +272,9 @@ TEST_P(URLLoaderFactoryImplTest, GetFailedResponse2) {

request.resource_type = RESOURCE_TYPE_XHR;

// Need to set |request_initiator| for non main frame type request.

request.request_initiator = url::Origin();

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), 2, 1,

- mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), 2, 1, mojom::kURLLoadOptionNone, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

client.RunUntilComplete();

ASSERT_FALSE(client.has_received_response());

@@ -297,9 +299,9 @@ TEST_P(URLLoaderFactoryImplTest, InvalidURL) {

// Need to set |request_initiator| for non main frame type request.

request.request_initiator = url::Origin();

ASSERT_FALSE(request.url.is_valid());

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), 2, 1,

- mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), 2, 1, mojom::kURLLoadOptionNone, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

client.RunUntilComplete();

ASSERT_FALSE(client.has_received_response());

@@ -323,9 +325,9 @@ TEST_P(URLLoaderFactoryImplTest, ShouldNotRequestURL) {

request.resource_type = RESOURCE_TYPE_XHR;

// Need to set |request_initiator| for non main frame type request.

request.request_initiator = url::Origin();

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), 2, 1,

- mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), 2, 1, mojom::kURLLoadOptionNone, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

client.RunUntilComplete();

rdh_.SetDelegate(nullptr);

@@ -353,9 +355,9 @@ TEST_P(URLLoaderFactoryImplTest, DownloadToFile) {

request.resource_type = RESOURCE_TYPE_XHR;

request.download_to_file = true;

request.request_initiator = url::Origin();

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,

- kRequestId, 0, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), kRoutingId, kRequestId, 0, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

ASSERT_FALSE(client.has_received_response());

ASSERT_FALSE(client.has_data_downloaded());

ASSERT_FALSE(client.has_received_completion());

@@ -420,9 +422,9 @@ TEST_P(URLLoaderFactoryImplTest, DownloadToFileFailure) {

request.resource_type = RESOURCE_TYPE_XHR;

request.download_to_file = true;

request.request_initiator = url::Origin();

- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,

- kRequestId, 0, request,

- client.CreateInterfacePtr());

+ factory_->CreateLoaderAndStart(

+ mojo::MakeRequest(&loader), kRoutingId, kRequestId, 0, request,

+ client.CreateInterfacePtr(), TRAFFIC_ANNOTATION_FOR_TESTS);

ASSERT_FALSE(client.has_received_response());

ASSERT_FALSE(client.has_data_downloaded());

ASSERT_FALSE(client.has_received_completion());

@@ -485,7 +487,8 @@ TEST_P(URLLoaderFactoryImplTest, OnTransferSizeUpdated) {

request.report_raw_headers = true;

factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,

kRequestId, mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ client.CreateInterfacePtr(),

+ TRAFFIC_ANNOTATION_FOR_TESTS);

client.RunUntilComplete();

@@ -545,7 +548,8 @@ TEST_P(URLLoaderFactoryImplTest, CancelFromRenderer) {

request.request_initiator = url::Origin();

factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,

kRequestId, mojom::kURLLoadOptionNone, request,

- client.CreateInterfacePtr());

+ client.CreateInterfacePtr(),

+ TRAFFIC_ANNOTATION_FOR_TESTS);

base::RunLoop().RunUntilIdle();

ASSERT_TRUE(rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId)));