Skip to content

GitLab

T
tangled
Commit af4f14c5 authored by rhalavati's avatar rhalavati Committed by Commit bot
Browse files
Options

Network traffic annotation added to components/ unittests. 

Test Network traffic annotation tag is added to network requests of uniitests
in components/.

BUG=656607

Review-Url: https://codereview.chromium.org/2805843003
Cr-Commit-Position: refs/heads/master@{#463240}
parent 8fa933df
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 18 deletions
components/data_usage/core/data_use_aggregator_unittest.cc
View file @ af4f14c5
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "net/base/network_change_notifier.h" #include "net/base/network_change_notifier.h"
#include "net/base/network_delegate_impl.h" #include "net/base/network_delegate_impl.h"
#include "net/socket/socket_test_util.h" #include "net/socket/socket_test_util.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -278,8 +279,8 @@ class DataUseAggregatorTest : public testing::Test { ...@@ -278,8 +279,8 @@ class DataUseAggregatorTest : public testing::Test {
mock_socket_factory_->AddSocketDataProvider(&socket); mock_socket_factory_->AddSocketDataProvider(&socket);
net::TestDelegate delegate; net::TestDelegate delegate;
std::unique_ptr<net::URLRequest> request = std::unique_ptr<net::URLRequest> request = context_->CreateRequest(
context_->CreateRequest(url, net::IDLE, &delegate); url, net::IDLE, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS);
request->set_first_party_for_cookies(first_party_for_cookies); request->set_first_party_for_cookies(first_party_for_cookies);
ReportingNetworkDelegate::DataUseContextMap data_use_context_map; ReportingNetworkDelegate::DataUseContextMap data_use_context_map;
......
components/data_use_measurement/core/data_use_measurement_unittest.cc
View file @ af4f14c5
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "net/base/network_change_notifier.h" #include "net/base/network_change_notifier.h"
#include "net/base/request_priority.h" #include "net/base/request_priority.h"
#include "net/socket/socket_test_util.h" #include "net/socket/socket_test_util.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -133,8 +134,9 @@ class DataUseMeasurementTest : public testing::Test { ...@@ -133,8 +134,9 @@ class DataUseMeasurementTest : public testing::Test {
0); 0);
socket_factory_->AddSocketDataProvider(&socket_data); socket_factory_->AddSocketDataProvider(&socket_data);
std::unique_ptr<net::URLRequest> request(context_->CreateRequest( std::unique_ptr<net::URLRequest> request(
GURL("http://foo.com"), net::DEFAULT_PRIORITY, &test_delegate)); context_->CreateRequest(GURL("http://foo.com"), net::DEFAULT_PRIORITY,
&test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
if (is_user_request == kUserRequest) { if (is_user_request == kUserRequest) {
TestURLRequestClassifier::MarkAsUserRequest(request.get()); TestURLRequestClassifier::MarkAsUserRequest(request.get());
} else { } else {
......
components/data_use_measurement/core/data_use_network_delegate_unittest.cc
View file @ af4f14c5
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "components/data_use_measurement/core/url_request_classifier.h" #include "components/data_use_measurement/core/url_request_classifier.h"
#include "components/metrics/data_use_tracker.h" #include "components/metrics/data_use_tracker.h"
#include "net/socket/socket_test_util.h" #include "net/socket/socket_test_util.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -101,8 +102,9 @@ std::unique_ptr<net::URLRequest> RequestURL( ...@@ -101,8 +102,9 @@ std::unique_ptr<net::URLRequest> RequestURL(
socket_factory->AddSocketDataProvider(&response_socket_data_provider); socket_factory->AddSocketDataProvider(&response_socket_data_provider);
net::TestDelegate test_delegate; net::TestDelegate test_delegate;
test_delegate.set_quit_on_complete(true); test_delegate.set_quit_on_complete(true);
std::unique_ptr<net::URLRequest> request(context->CreateRequest( std::unique_ptr<net::URLRequest> request(
GURL("http://example.com"), net::DEFAULT_PRIORITY, &test_delegate)); context->CreateRequest(GURL("http://example.com"), net::DEFAULT_PRIORITY,
&test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
if (from_user) { if (from_user) {
TestURLRequestClassifier::MarkAsUserRequest(request.get()); TestURLRequestClassifier::MarkAsUserRequest(request.get());
......
components/net_log/net_log_file_writer_unittest.cc
View file @ af4f14c5
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "net/http/http_network_session.h" #include "net/http/http_network_session.h"
#include "net/log/net_log_capture_mode.h" #include "net/log/net_log_capture_mode.h"
#include "net/log/net_log_event_type.h" #include "net/log/net_log_event_type.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -191,7 +192,8 @@ void SetUpTestContextGetterWithRequest( ...@@ -191,7 +192,8 @@ void SetUpTestContextGetterWithRequest(
context->set_net_log(net_log); context->set_net_log(net_log);
context->Init(); context->Init();
*request = context->CreateRequest(url, net::IDLE, delegate); *request = context->CreateRequest(url, net::IDLE, delegate,
TRAFFIC_ANNOTATION_FOR_TESTS);
(*request)->Start(); (*request)->Start();
*context_getter = new net::TestURLRequestContextGetter( *context_getter = new net::TestURLRequestContextGetter(
......
components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
View file @ af4f14c5
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/test/test_simple_task_runner.h" #include "base/test/test_simple_task_runner.h"
#include "net/http/http_request_headers.h" #include "net/http/http_request_headers.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -55,14 +56,16 @@ class PolicyHeaderIOHelperTest : public testing::Test { ...@@ -55,14 +56,16 @@ class PolicyHeaderIOHelperTest : public testing::Test {
TEST_F(PolicyHeaderIOHelperTest, InitialHeader) { TEST_F(PolicyHeaderIOHelperTest, InitialHeader) {
std::unique_ptr<net::URLRequest> request( std::unique_ptr<net::URLRequest> request(
context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL)); context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request->url(), request.get()); helper_->AddPolicyHeaders(request->url(), request.get());
ValidateHeader(request->extra_request_headers(), kInitialPolicyHeader); ValidateHeader(request->extra_request_headers(), kInitialPolicyHeader);
} }
TEST_F(PolicyHeaderIOHelperTest, NoHeaderOnNonMatchingURL) { TEST_F(PolicyHeaderIOHelperTest, NoHeaderOnNonMatchingURL) {
std::unique_ptr<net::URLRequest> request(context_.CreateRequest( std::unique_ptr<net::URLRequest> request(context_.CreateRequest(
GURL("http://non-matching.com"), net::DEFAULT_PRIORITY, NULL)); GURL("http://non-matching.com"), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request->url(), request.get()); helper_->AddPolicyHeaders(request->url(), request.get());
EXPECT_TRUE(request->extra_request_headers().IsEmpty()); EXPECT_TRUE(request->extra_request_headers().IsEmpty());
} }
...@@ -72,7 +75,8 @@ TEST_F(PolicyHeaderIOHelperTest, HeaderChange) { ...@@ -72,7 +75,8 @@ TEST_F(PolicyHeaderIOHelperTest, HeaderChange) {
helper_->UpdateHeader(new_header); helper_->UpdateHeader(new_header);
task_runner_->RunUntilIdle(); task_runner_->RunUntilIdle();
std::unique_ptr<net::URLRequest> request( std::unique_ptr<net::URLRequest> request(
context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL)); context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request->url(), request.get()); helper_->AddPolicyHeaders(request->url(), request.get());
ValidateHeader(request->extra_request_headers(), new_header); ValidateHeader(request->extra_request_headers(), new_header);
} }
...@@ -81,7 +85,8 @@ TEST_F(PolicyHeaderIOHelperTest, ChangeToNoHeader) { ...@@ -81,7 +85,8 @@ TEST_F(PolicyHeaderIOHelperTest, ChangeToNoHeader) {
helper_->UpdateHeader(""); helper_->UpdateHeader("");
task_runner_->RunUntilIdle(); task_runner_->RunUntilIdle();
std::unique_ptr<net::URLRequest> request( std::unique_ptr<net::URLRequest> request(
context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL)); context_.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request->url(), request.get()); helper_->AddPolicyHeaders(request->url(), request.get());
EXPECT_TRUE(request->extra_request_headers().IsEmpty()); EXPECT_TRUE(request->extra_request_headers().IsEmpty());
} }
......
components/policy/core/common/cloud/policy_header_service_unittest.cc
View file @ af4f14c5
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "components/policy/core/common/cloud/mock_cloud_policy_store.h" #include "components/policy/core/common/cloud/mock_cloud_policy_store.h"
#include "components/policy/core/common/cloud/policy_header_io_helper.h" #include "components/policy/core/common/cloud/policy_header_io_helper.h"
#include "net/http/http_request_headers.h" #include "net/http/http_request_headers.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -111,7 +112,8 @@ TEST_F(PolicyHeaderServiceTest, TestWithAndWithoutPolicyHeader) { ...@@ -111,7 +112,8 @@ TEST_F(PolicyHeaderServiceTest, TestWithAndWithoutPolicyHeader) {
net::TestURLRequestContext context; net::TestURLRequestContext context;
std::unique_ptr<net::URLRequest> request( std::unique_ptr<net::URLRequest> request(
context.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL)); context.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request->url(), request.get()); helper_->AddPolicyHeaders(request->url(), request.get());
ValidateHeader(request->extra_request_headers(), expected_dmtoken, ValidateHeader(request->extra_request_headers(), expected_dmtoken,
expected_policy_token); expected_policy_token);
...@@ -121,7 +123,8 @@ TEST_F(PolicyHeaderServiceTest, TestWithAndWithoutPolicyHeader) { ...@@ -121,7 +123,8 @@ TEST_F(PolicyHeaderServiceTest, TestWithAndWithoutPolicyHeader) {
task_runner_->RunUntilIdle(); task_runner_->RunUntilIdle();
std::unique_ptr<net::URLRequest> request2( std::unique_ptr<net::URLRequest> request2(
context.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL)); context.CreateRequest(GURL(kDMServerURL), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS));
helper_->AddPolicyHeaders(request2->url(), request2.get()); helper_->AddPolicyHeaders(request2->url(), request2.get());
ValidateHeader(request2->extra_request_headers(), "", ""); ValidateHeader(request2->extra_request_headers(), "", "");
} }
......
components/previews/core/previews_io_data_unittest.cc
View file @ af4f14c5
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "net/base/load_flags.h" #include "net/base/load_flags.h"
#include "net/nqe/effective_connection_type.h" #include "net/nqe/effective_connection_type.h"
#include "net/nqe/network_quality_estimator_test_util.h" #include "net/nqe/network_quality_estimator_test_util.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -145,7 +146,8 @@ class PreviewsIODataTest : public testing::Test { ...@@ -145,7 +146,8 @@ class PreviewsIODataTest : public testing::Test {
std::unique_ptr<net::URLRequest> CreateRequest() const { std::unique_ptr<net::URLRequest> CreateRequest() const {
return context_.CreateRequest(GURL("http://example.com"), return context_.CreateRequest(GURL("http://example.com"),
net::DEFAULT_PRIORITY, nullptr); net::DEFAULT_PRIORITY, nullptr,
TRAFFIC_ANNOTATION_FOR_TESTS);
} }
TestPreviewsIOData* io_data() { return &io_data_; } TestPreviewsIOData* io_data() { return &io_data_; }
......
components/signin/core/browser/signin_header_helper_unittest.cc
View file @ af4f14c5
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "components/signin/core/browser/signin_header_helper.h" #include "components/signin/core/browser/signin_header_helper.h"
#include "components/signin/core/common/signin_switches.h" #include "components/signin/core/common/signin_switches.h"
#include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/sync_preferences/testing_pref_service_syncable.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request_test_util.h" #include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -42,7 +43,8 @@ class SigninHeaderHelperTest : public testing::Test { ...@@ -42,7 +43,8 @@ class SigninHeaderHelperTest : public testing::Test {
const std::string& expected_request) { const std::string& expected_request) {
bool expected_result = !expected_request.empty(); bool expected_result = !expected_request.empty();
std::unique_ptr<net::URLRequest> url_request = std::unique_ptr<net::URLRequest> url_request =
url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr,
TRAFFIC_ANNOTATION_FOR_TESTS);
EXPECT_EQ(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( EXPECT_EQ(signin::AppendOrRemoveMirrorRequestHeaderIfPossible(
url_request.get(), GURL(), account_id, cookie_settings_.get(), url_request.get(), GURL(), account_id, cookie_settings_.get(),
signin::PROFILE_MODE_DEFAULT), signin::PROFILE_MODE_DEFAULT),
...@@ -153,7 +155,8 @@ TEST_F(SigninHeaderHelperTest, TestMirrorHeaderEligibleRedirectURL) { ...@@ -153,7 +155,8 @@ TEST_F(SigninHeaderHelperTest, TestMirrorHeaderEligibleRedirectURL) {
const GURL redirect_url("https://www.google.com"); const GURL redirect_url("https://www.google.com");
const std::string account_id = "0123456789"; const std::string account_id = "0123456789";
std::unique_ptr<net::URLRequest> url_request = std::unique_ptr<net::URLRequest> url_request =
url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr,
TRAFFIC_ANNOTATION_FOR_TESTS);
EXPECT_TRUE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( EXPECT_TRUE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible(
url_request.get(), redirect_url, account_id, cookie_settings_.get(), url_request.get(), redirect_url, account_id, cookie_settings_.get(),
signin::PROFILE_MODE_DEFAULT)); signin::PROFILE_MODE_DEFAULT));
...@@ -171,7 +174,8 @@ TEST_F(SigninHeaderHelperTest, TestMirrorHeaderNonEligibleRedirectURL) { ...@@ -171,7 +174,8 @@ TEST_F(SigninHeaderHelperTest, TestMirrorHeaderNonEligibleRedirectURL) {
const GURL redirect_url("http://www.foo.com"); const GURL redirect_url("http://www.foo.com");
const std::string account_id = "0123456789"; const std::string account_id = "0123456789";
std::unique_ptr<net::URLRequest> url_request = std::unique_ptr<net::URLRequest> url_request =
url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr,
TRAFFIC_ANNOTATION_FOR_TESTS);
EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible(
url_request.get(), redirect_url, account_id, cookie_settings_.get(), url_request.get(), redirect_url, account_id, cookie_settings_.get(),
signin::PROFILE_MODE_DEFAULT)); signin::PROFILE_MODE_DEFAULT));
...@@ -190,7 +194,8 @@ TEST_F(SigninHeaderHelperTest, TestIgnoreMirrorHeaderNonEligibleURLs) { ...@@ -190,7 +194,8 @@ TEST_F(SigninHeaderHelperTest, TestIgnoreMirrorHeaderNonEligibleURLs) {
const std::string account_id = "0123456789"; const std::string account_id = "0123456789";
const std::string fake_header = "foo,bar"; const std::string fake_header = "foo,bar";
std::unique_ptr<net::URLRequest> url_request = std::unique_ptr<net::URLRequest> url_request =
url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr,
TRAFFIC_ANNOTATION_FOR_TESTS);
url_request->SetExtraRequestHeaderByName(signin::kChromeConnectedHeader, url_request->SetExtraRequestHeaderByName(signin::kChromeConnectedHeader,
fake_header, false); fake_header, false);
EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment