Update proxy annotations.

Network traffic annotation of direct, settings, and headless proxies
are updated.

Bug: 656607
Change-Id: I8513c05e7cda77aa62bb2cd85c90afb316996a90
Reviewed-on: https://chromium-review.googlesource.com/958504
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Alex Clarke <alexclarke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542766}

components/proxy_config/pref_proxy_config_tracker_impl.cc

@@ -22,12 +22,11 @@
 
 namespace {
 
-// TODO(rhalavati): Update annotation.
 constexpr net::NetworkTrafficAnnotationTag
     kSettingsProxyConfigTrafficAnnotation =
         net::DefineNetworkTrafficAnnotation("proxy_config_settings", R"(
       semantics {
-        sender: "Preferences Proxy Config"
+        sender: "Proxy Config"
         description:
           "Creates a proxy based on configuration received from settings."
         trigger:

headless/lib/browser/headless_url_request_context_getter.cc

@@ -147,11 +147,33 @@ HeadlessURLRequestContextGetter::GetURLRequestContext() {
     builder.set_data_enabled(true);
     builder.set_file_enabled(true);
     if (proxy_config_) {
-      // TODO(https://crbug.com/656607): Add proper traffic annotation.
+      net::NetworkTrafficAnnotationTag traffic_annotation =
+          net::DefineNetworkTrafficAnnotation("proxy_config_headless", R"(
+        semantics {
+          sender: "Proxy Config"
+          description:
+            "Creates a proxy based on configuration received from headless "
+            "command prompt."
+          trigger:
+            "User starts headless with proxy config."
+          data:
+            "Proxy configurations."
+          destination: OTHER
+          destination_other:
+            "The proxy server specified in the configuration."
+        }
+        policy {
+          cookies_allowed: NO
+          setting:
+            "This config is only used for headless mode and provided by user."
+          policy_exception_justification:
+            "This config is only used for headless mode and provided by user."
+        })");
+
       builder.set_proxy_resolution_service(
           net::ProxyResolutionService::CreateFixed(
-              net::ProxyConfigWithAnnotation(
-                  *proxy_config_, NO_TRAFFIC_ANNOTATION_BUG_656607)));
+              net::ProxyConfigWithAnnotation(*proxy_config_,
+                                             traffic_annotation)));
     } else {
       builder.set_proxy_config_service(std::move(proxy_config_service_));
     }

net/proxy_resolution/proxy_config_with_annotation.cc

@@ -8,16 +8,17 @@ namespace net {
 
 namespace {
 
-// TODO(rhalavati): Update annotation.
 constexpr NetworkTrafficAnnotationTag kDirectProxyTrafficAnnotation =
     DefineNetworkTrafficAnnotation("proxy_config_direct", R"(
     semantics {
       sender: "Proxy Config"
       description:
-        "This settings create a direct proxy, which practically connects "
-        "directly to the target website without any intervention."
+        "Direct connections are being used instead of a proxy. This is a place "
+        "holder annotation that would include details about where the "
+        "configuration, which can trigger fetching a PAC file, came from."
       trigger:
-        "Direct proxy is the default mode of connection."
+        "Connecting directly to destination sites instead of using a proxy is "
+        "the default behavior."
       data:
         "None."
       destination: WEBSITE
@@ -25,7 +26,8 @@ constexpr NetworkTrafficAnnotationTag kDirectProxyTrafficAnnotation =
     policy {
       cookies_allowed: NO
       setting:
-        "Selecting a proxy in settings will prevent use of direct proxy."
+        "This isn't a real network request. A proxy can be selected in "
+        "settings."
       policy_exception_justification:
         "Using either of 'ProxyMode', 'ProxyServer', or 'ProxyPacUrl' policies "
         "can set Chrome to use a specific proxy settings and avoid directly "

tools/traffic_annotation/summary/annotations.xml

@@ -178,8 +178,9 @@ Refer to README.md for content description and update process.
  <item id="privet_http_impl" hash_code="71251498" type="0" content_hash_code="107348604" os_list="linux,windows" file_path="chrome/browser/printing/cloud_print/privet_http_impl.cc"/>
  <item id="profile_avatar" hash_code="51164680" type="0" content_hash_code="113550845" os_list="linux,windows" file_path="chrome/browser/profiles/profile_avatar_downloader.cc"/>
  <item id="profile_resetter_upload" hash_code="105330607" type="0" content_hash_code="129329171" os_list="linux,windows" file_path="chrome/browser/profile_resetter/reset_report_uploader.cc"/>
- <item id="proxy_config_direct" hash_code="119015679" type="0" content_hash_code="131944978" os_list="linux,windows" file_path="net/proxy_resolution/proxy_config_with_annotation.cc"/>
- <item id="proxy_config_settings" hash_code="136468456" type="0" content_hash_code="136747792" os_list="linux,windows" file_path="components/proxy_config/pref_proxy_config_tracker_impl.cc"/>
+ <item id="proxy_config_direct" hash_code="119015679" type="0" content_hash_code="119931568" os_list="linux,windows" file_path="net/proxy_resolution/proxy_config_with_annotation.cc"/>
+ <item id="proxy_config_headless" hash_code="133221587" type="0" content_hash_code="77459277" os_list="linux,windows" file_path="headless/lib/browser/headless_url_request_context_getter.cc"/>
+ <item id="proxy_config_settings" hash_code="136468456" type="0" content_hash_code="19527377" os_list="linux,windows" file_path="components/proxy_config/pref_proxy_config_tracker_impl.cc"/>
  <item id="proxy_script_fetcher" hash_code="37531401" type="0" content_hash_code="31866133" os_list="linux,windows" file_path="net/proxy_resolution/pac_file_fetcher_impl.cc"/>
  <item id="puch_client_channel" hash_code="34459548" type="0" content_hash_code="92475475" os_list="linux,windows" file_path="components/invalidation/impl/push_client_channel.cc"/>
  <item id="quic_chromium_incoming_session" hash_code="87635401" type="0" content_hash_code="78573093" os_list="linux,windows" file_path="net/quic/chromium/quic_chromium_client_session.cc"/>