Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2893233002: Network traffic annotation added to URLLoaderImpl. (Closed)
Patch Set: Comment addressed, Merged. Created 3 years, 6 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
Download patch
« no previous file with comments | « content/browser/loader/url_loader_factory_impl.cc ('k') | content/browser/service_worker/service_worker_fetch_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 2254eb4f38e0a43a29f6f0a57eb5e84150e577cf..b7aa147b58aefffec9a4ad40419f2df51fdb0cac 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"
@@ -165,9 +166,10 @@ TEST_P(URLLoaderFactoryImplTest, GetResponse) {
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), kRoutingId,
- kRequestId, mojom::kURLLoadOptionNone, request,
- client.CreateInterfacePtr());
+ factory_->CreateLoaderAndStart(
+ mojo::MakeRequest(&loader), kRoutingId, kRequestId,
+ mojom::kURLLoadOptionNone, request, client.CreateInterfacePtr(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
ASSERT_FALSE(client.has_received_response());
ASSERT_FALSE(client.response_body().is_valid());
@@ -241,9 +243,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
client.RunUntilComplete();
ASSERT_FALSE(client.has_received_response());
@@ -270,9 +273,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
client.RunUntilComplete();
ASSERT_FALSE(client.has_received_response());
@@ -297,9 +301,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
client.RunUntilComplete();
ASSERT_FALSE(client.has_received_response());
@@ -323,9 +328,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
client.RunUntilComplete();
rdh_.SetDelegate(nullptr);
@@ -353,9 +359,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
ASSERT_FALSE(client.has_received_response());
ASSERT_FALSE(client.has_data_downloaded());
ASSERT_FALSE(client.has_received_completion());
@@ -420,9 +427,10 @@ 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(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
ASSERT_FALSE(client.has_received_response());
ASSERT_FALSE(client.has_data_downloaded());
ASSERT_FALSE(client.has_received_completion());
@@ -483,9 +491,10 @@ TEST_P(URLLoaderFactoryImplTest, OnTransferSizeUpdated) {
// Need to set |request_initiator| for non main frame type request.
request.request_initiator = url::Origin();
request.report_raw_headers = true;
- factory_->CreateLoaderAndStart(mojo::MakeRequest(&loader), kRoutingId,
- kRequestId, mojom::kURLLoadOptionNone, request,
- client.CreateInterfacePtr());
+ factory_->CreateLoaderAndStart(
+ mojo::MakeRequest(&loader), kRoutingId, kRequestId,
+ mojom::kURLLoadOptionNone, request, client.CreateInterfacePtr(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
client.RunUntilComplete();
@@ -543,9 +552,10 @@ TEST_P(URLLoaderFactoryImplTest, CancelFromRenderer) {
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), kRoutingId,
- kRequestId, mojom::kURLLoadOptionNone, request,
- client.CreateInterfacePtr());
+ factory_->CreateLoaderAndStart(
+ mojo::MakeRequest(&loader), kRoutingId, kRequestId,
+ mojom::kURLLoadOptionNone, request, client.CreateInterfacePtr(),
+ net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS));
base::RunLoop().RunUntilIdle();
ASSERT_TRUE(rdh_.GetURLRequest(GlobalRequestID(kChildId, kRequestId)));
« no previous file with comments | « content/browser/loader/url_loader_factory_impl.cc ('k') | content/browser/service_worker/service_worker_fetch_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698