Remove previews-specific traffic annotation from prober

Next CL will see this code moved to a new dir under //chrome/browser

Bug: 986359
Change-Id: Id6d0a43b684db7aa3bcd751c6d3b7e58702ec208
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715105Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680080}

chrome/browser/previews/previews_prober.cc

@@ -26,7 +26,6 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
-#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/simple_url_loader.h"
@@ -221,6 +220,7 @@ PreviewsProber::PreviewsProber(
     const net::HttpRequestHeaders headers,
     const RetryPolicy& retry_policy,
     const TimeoutPolicy& timeout_policy,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation,
     const size_t max_cache_entries,
     base::TimeDelta revalidate_cache_after)
     : PreviewsProber(delegate,
@@ -232,6 +232,7 @@ PreviewsProber::PreviewsProber(
                      headers,
                      retry_policy,
                      timeout_policy,
+                     traffic_annotation,
                      max_cache_entries,
                      revalidate_cache_after,
                      base::DefaultTickClock::GetInstance(),
@@ -247,6 +248,7 @@ PreviewsProber::PreviewsProber(
     const net::HttpRequestHeaders headers,
     const RetryPolicy& retry_policy,
     const TimeoutPolicy& timeout_policy,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation,
     const size_t max_cache_entries,
     base::TimeDelta revalidate_cache_after,
     const base::TickClock* tick_clock,
@@ -261,6 +263,7 @@ PreviewsProber::PreviewsProber(
       timeout_policy_(timeout_policy),
       max_cache_entries_(max_cache_entries),
       revalidate_cache_after_(revalidate_cache_after),
+      traffic_annotation_(traffic_annotation),
       successive_retry_count_(0),
       successive_timeout_count_(0),
       cached_probe_results_(std::make_unique<base::DictionaryValue>()),
@@ -385,28 +388,6 @@ void PreviewsProber::CreateAndStartURLLoader() {
     url = url.ReplaceComponents(replacements);
   }
 
-  net::NetworkTrafficAnnotationTag traffic_annotation =
-      net::DefineNetworkTrafficAnnotation("previews_prober", R"(
-        semantics {
-          sender: "Previews Prober"
-          description:
-            "Requests a small resource to test network connectivity to a given "
-            "resource or domain which will either be a Google owned domain or"
-            "the website that the user is navigating to."
-          trigger:
-            "Requested when Lite mode and Previews are enabled on startup and "
-            "on every network change."
-          data: "None."
-          destination: WEBSITE
-        }
-        policy {
-          cookies_allowed: NO
-          setting:
-            "Users can control Lite mode on Android via the settings menu. "
-            "Lite mode is not available on iOS, and on desktop only for "
-            "developer testing."
-          policy_exception_justification: "Not implemented."
-        })");
   auto request = std::make_unique<network::ResourceRequest>();
   request->url = url;
   request->method = HttpMethodToString(http_method_);
@@ -415,7 +396,7 @@ void PreviewsProber::CreateAndStartURLLoader() {
   request->allow_credentials = false;
 
   url_loader_ =
-      network::SimpleURLLoader::Create(std::move(request), traffic_annotation);
+      network::SimpleURLLoader::Create(std::move(request), traffic_annotation_);
   url_loader_->SetAllowHttpErrorResults(true);
 
   url_loader_->DownloadToString(

chrome/browser/previews/previews_prober.h

@@ -23,6 +23,7 @@
 #include "build/build_config.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "services/network/public/cpp/network_connection_tracker.h"
 #include "services/network/public/cpp/resource_response.h"
 #include "url/gurl.h"
@@ -140,6 +141,7 @@ class PreviewsProber
       const net::HttpRequestHeaders headers,
       const RetryPolicy& retry_policy,
       const TimeoutPolicy& timeout_policy,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation,
       const size_t max_cache_entries,
       base::TimeDelta revalidate_cache_after);
   ~PreviewsProber() override;
@@ -180,6 +182,7 @@ class PreviewsProber
       const net::HttpRequestHeaders headers,
       const RetryPolicy& retry_policy,
       const TimeoutPolicy& timeout_policy,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation,
       const size_t max_cache_entries,
       base::TimeDelta revalidate_cache_after,
       const base::TickClock* tick_clock,
@@ -234,6 +237,9 @@ class PreviewsProber
   // background.
   const base::TimeDelta revalidate_cache_after_;
 
+  // The traffic annotation to use for creating |url_loader_|.
+  const net::NetworkTrafficAnnotationTag traffic_annotation_;
+
   // The number of retries that have been attempted. This count does not include
   // the original probe.
   size_t successive_retry_count_;

chrome/browser/previews/previews_prober_browsertest.cc

@@ -19,6 +19,7 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/mojom/network_service_test.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
@@ -133,7 +134,8 @@ IN_PROC_BROWSER_TEST_F(PreviewsProberBrowserTest, OK) {
                         browser()->profile()->GetPrefs(),
                         PreviewsProber::ClientName::kLitepages, url,
                         PreviewsProber::HttpMethod::kGet, headers, retry_policy,
-                        timeout_policy, 1, base::TimeDelta::FromDays(1));
+                        timeout_policy, TRAFFIC_ANNOTATION_FOR_TESTS, 1,
+                        base::TimeDelta::FromDays(1));
   prober.SendNowIfInactive(false);
   WaitForCompletedProbe(&prober);
 
@@ -155,7 +157,8 @@ IN_PROC_BROWSER_TEST_F(PreviewsProberBrowserTest, Timeout) {
                         browser()->profile()->GetPrefs(),
                         PreviewsProber::ClientName::kLitepages, url,
                         PreviewsProber::HttpMethod::kGet, headers, retry_policy,
-                        timeout_policy, 1, base::TimeDelta::FromDays(1));
+                        timeout_policy, TRAFFIC_ANNOTATION_FOR_TESTS, 1,
+                        base::TimeDelta::FromDays(1));
   prober.SendNowIfInactive(false);
   WaitForCompletedProbe(&prober);
 
@@ -180,7 +183,8 @@ IN_PROC_BROWSER_TEST_F(PreviewsProberBrowserTest, MAYBE_NetworkChange) {
                         browser()->profile()->GetPrefs(),
                         PreviewsProber::ClientName::kLitepages, url,
                         PreviewsProber::HttpMethod::kGet, headers, retry_policy,
-                        timeout_policy, 1, base::TimeDelta::FromDays(1));
+                        timeout_policy, TRAFFIC_ANNOTATION_FOR_TESTS, 1,
+                        base::TimeDelta::FromDays(1));
   SimulateNetworkChange(network::mojom::ConnectionType::CONNECTION_4G);
   WaitForCompletedProbe(&prober);
 

chrome/browser/previews/previews_prober_unittest.cc

@@ -16,6 +16,7 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/resource_response.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
@@ -63,6 +64,7 @@ class TestPreviewsProber : public PreviewsProber {
       const net::HttpRequestHeaders headers,
       const RetryPolicy& retry_policy,
       const TimeoutPolicy& timeout_policy,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation,
       const size_t max_cache_entries,
       base::TimeDelta revalidate_cache_after,
       const base::TickClock* tick_clock,
@@ -76,6 +78,7 @@ class TestPreviewsProber : public PreviewsProber {
                        headers,
                        retry_policy,
                        timeout_policy,
+                       traffic_annotation,
                        max_cache_entries,
                        revalidate_cache_after,
                        tick_clock,
@@ -125,8 +128,9 @@ class PreviewsProberTest : public testing::Test {
             delegate, test_shared_loader_factory_, &test_prefs_,
             PreviewsProber::ClientName::kLitepages, kTestUrl,
             PreviewsProber::HttpMethod::kGet, headers, retry_policy,
-            timeout_policy, 1, kCacheRevalidateAfter,
-            thread_bundle_.GetMockTickClock(), thread_bundle_.GetMockClock());
+            timeout_policy, TRAFFIC_ANNOTATION_FOR_TESTS, 1,
+            kCacheRevalidateAfter, thread_bundle_.GetMockTickClock(),
+            thread_bundle_.GetMockClock());
     prober->SetOnCompleteCallback(base::BindRepeating(
         &PreviewsProberTest::OnProbeComplete, base::Unretained(this)));
     return prober;