Annotation added to Certificate Reporting Service.

Network traffic annotation is added to the report sent from Certificate
Reporting Service

Bug: 656607
Change-Id: Ic365fd2d21c9f38977220e74b38e70f4d2db4b9c
Reviewed-on: https://chromium-review.googlesource.com/947967Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542759}

chrome/browser/safe_browsing/certificate_reporting_service.cc

@@ -14,7 +14,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/common/safe_browsing_prefs.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace {
 
@@ -321,8 +321,28 @@ void CertificateReportingService::ResetOnIOThread(
   std::unique_ptr<certificate_reporting::ErrorReporter> error_reporter;
   if (server_public_key) {
     // Only used in tests.
-    std::unique_ptr<net::ReportSender> report_sender(new net::ReportSender(
-        url_request_context, TRAFFIC_ANNOTATION_FOR_TESTS));
+    net::NetworkTrafficAnnotationTag traffic_annotation =
+        net::DefineNetworkTrafficAnnotation(
+            "certificate_reporting_service_test", R"(
+        semantics {
+          sender: "Certificate Reporting Service Test"
+          description:
+            "This request is used for testing certificate reporting service."
+          trigger: "Upon request from testing API."
+          data:
+            "No user data."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: NO
+          setting:
+            "This feature is only used for testing."
+          policy_exception_justification:
+            "This feature is only used for testing."
+        }
+    )");
+    std::unique_ptr<net::ReportSender> report_sender(
+        new net::ReportSender(url_request_context, traffic_annotation));
     error_reporter.reset(new certificate_reporting::ErrorReporter(
         GURL(kExtendedReportingUploadUrl), server_public_key,
         server_public_key_version, std::move(report_sender)));

tools/traffic_annotation/summary/annotations.xml

@@ -36,6 +36,7 @@ Refer to README.md for content description and update process.
  <item id="cast_socket" hash_code="115192205" type="0" content_hash_code="63056899" os_list="linux,windows" file_path="components/cast_channel/cast_socket.cc"/>
  <item id="cast_udp_socket" hash_code="22573197" type="0" content_hash_code="75328301" os_list="linux,windows" file_path="media/cast/net/udp_socket_client.cc"/>
  <item id="cast_udp_transport" hash_code="5576536" type="0" content_hash_code="107643273" os_list="linux,windows" file_path="media/cast/net/udp_transport_impl.cc"/>
+ <item id="certificate_reporting_service_test" hash_code="98123372" type="0" content_hash_code="136253658" os_list="linux,windows" file_path="chrome/browser/safe_browsing/certificate_reporting_service.cc"/>
  <item id="certificate_verifier" hash_code="113553577" type="0" content_hash_code="62346354" os_list="linux,windows" file_path="net/cert_net/cert_net_fetcher_impl.cc"/>
  <item id="chrome_apps_socket_api" hash_code="8591273" type="0" content_hash_code="70868355" os_list="linux,windows" file_path="extensions/browser/api/socket/socket.cc"/>
  <item id="chrome_cleaner" hash_code="27071967" type="0" content_hash_code="111240292" os_list="windows" file_path="chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc"/>