Commit 8aa3fbb7 authored by rhalavati's avatar rhalavati Committed by Commit bot

Network traffic annotation added to browser unittests.

Network traffic annotation is added to network requests of:
chrome/browser/net/proxy_browsertest.cc
chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
chrome/browser/prerender/prerender_resource_throttle_unittest.cc
chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc

BUG=656607

Review-Url: https://codereview.chromium.org/2895173002
Cr-Commit-Position: refs/heads/master@{#473740}
parent fd352340
......@@ -30,6 +30,7 @@
#include "net/test/embedded_test_server/embedded_test_server_connection_listener.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
#include "net/test/test_data_directory.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "url/gurl.h"
......@@ -363,7 +364,8 @@ IN_PROC_BROWSER_TEST_F(HangingPacRequestProxyScriptBrowserTest, Shutdown) {
// best to be safe.
HangingURLFetcherDelegate hanging_request_delegate;
std::unique_ptr<net::URLFetcher> hanging_fetcher = net::URLFetcher::Create(
GURL("http://blah/"), net::URLFetcher::GET, &hanging_request_delegate);
GURL("http://blah/"), net::URLFetcher::GET, &hanging_request_delegate,
TRAFFIC_ANNOTATION_FOR_TESTS);
hanging_fetcher->SetRequestContext(browser()->profile()->GetRequestContext());
hanging_fetcher->Start();
......
......@@ -23,6 +23,7 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "net/http/http_response_headers.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_test_util.h"
......@@ -213,7 +214,8 @@ class ResourcePrefetchPredictorTest : public testing::Test {
bool is_main_frame) {
std::unique_ptr<net::URLRequest> request =
url_request_context_.CreateRequest(url, priority,
&url_request_delegate_);
&url_request_delegate_,
TRAFFIC_ANNOTATION_FOR_TESTS);
request->set_first_party_for_cookies(url);
content::ResourceRequestInfo::AllocateForTesting(
request.get(), resource_type, nullptr, -1, -1, -1, is_main_frame, false,
......
......@@ -248,7 +248,7 @@ TEST_F(PrerenderResourceThrottleTest, RedirectMainFrame) {
DeferredRedirectDelegate delegate;
std::unique_ptr<net::URLRequest> request(url_request_context.CreateRequest(
net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
net::DEFAULT_PRIORITY, &delegate));
net::DEFAULT_PRIORITY, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
content::ResourceRequestInfo::AllocateForTesting(
request.get(), content::RESOURCE_TYPE_MAIN_FRAME, NULL, kDefaultChildId,
kDefaultRouteId, MSG_ROUTING_NONE,
......@@ -284,7 +284,7 @@ TEST_F(PrerenderResourceThrottleTest, RedirectSyncXHR) {
DeferredRedirectDelegate delegate;
std::unique_ptr<net::URLRequest> request(url_request_context.CreateRequest(
net::URLRequestMockHTTPJob::GetMockUrl("prerender/image-deferred.png"),
net::DEFAULT_PRIORITY, &delegate));
net::DEFAULT_PRIORITY, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS));
content::ResourceRequestInfo::AllocateForTesting(
request.get(), content::RESOURCE_TYPE_XHR, NULL, kDefaultChildId,
kDefaultRouteId, MSG_ROUTING_NONE,
......
......@@ -24,6 +24,7 @@
#include "net/ssl/ssl_cert_request_info.h"
#include "net/test/cert_test_util.h"
#include "net/test/test_data_directory.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
......@@ -133,7 +134,8 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest {
std::unique_ptr<net::URLRequest> MakeURLRequest(
net::URLRequestContextGetter* context_getter) {
return context_getter->GetURLRequestContext()->CreateRequest(
GURL("https://example"), net::DEFAULT_PRIORITY, NULL);
GURL("https://example"), net::DEFAULT_PRIORITY, NULL,
TRAFFIC_ANNOTATION_FOR_TESTS);
}
base::WaitableEvent io_loop_finished_event_;
......
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