Remove empty_policy_justification from traffic_annotation.proto.

'empty_policy_justification' field in traffic_annotation.proto is not
used in any annotation and doesn't seem to be needed. It is removed.

Bug: 656607
Change-Id: Iddde9ea668690b7a684d6f320b2cf952faa60e0c
Reviewed-on: https://chromium-review.googlesource.com/892880
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532914}

docs/network_traffic_annotations.md

@@ -123,9 +123,6 @@ Each network traffic annotation should specify the following items:
      points to `OTHER`.
 * `TrafficPolicy`: These set of fields specify the controls that a user may have
   on disabling or limiting the network request and its trace.
-   * `empty_policy_justification`: If traffic policy cannot be specified, like
-     when the request originates from inside network stack and none of the below
-     control policies applies to it, a plain text here can specify it.
    * `cookies_allowed`: Specifies if this request stores and uses cookies or
      not. Use values `YES` or `NO`.
    * `cookies_store`: If a request sends or stores cookies/channel IDs/... (i.e.
@@ -149,8 +146,7 @@ Each network traffic annotation should specify the following items:
      request. This would be a text serialized protobuf of any enterprise policy.
      See policy list or  chrome_settings.proto for the full list of policies.
    * `policy_exception_justification`: If there is no policy to disable or limit
-     this request, a justification can be presented here. In case ‘Empty Policy
-     Justification’ is presented, this field is not required.
+     this request, a justification can be presented here.
 * `comments`: If required, any human readable extra comments.
 
 ### Format and Examples
@@ -259,7 +255,6 @@ You can copy/paste the following template to define an annotation.
           destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER
         }
         policy {
-          empty_policy_justification = "..."
           cookies_allowed: NO/YES
           cookies_store: "..."
           setting: "..."

tools/traffic_annotation/README.md

@@ -99,4 +99,4 @@ and cc the people listed in OWNERS; they'll be on the hook to rebuild and
 re-enable the test.
 
 CLANG_REVISION = '321529'
-LASTCHANGE=671628d8a99b8420f4dadcdb82751c0d3ea2117a-refs/heads/master@{#530817}
+LASTCHANGE=c67646fb6096ac1d87b516b2eaf2eb9968d2da73-refs/heads/master@{#531988}

tools/traffic_annotation/auditor/instance.cc

@@ -452,7 +452,6 @@ AuditorResult AnnotationInstance::CreateCompleteAnnotation(
   traffic_annotation::NetworkTrafficAnnotation_TrafficPolicy* dst_policy =
       combination->proto.mutable_policy();
 
-  MERGE_STRING_FIELDS(src_policy, dst_policy, empty_policy_justification);
   MERGE_STRING_FIELDS(src_policy, dst_policy, cookies_store);
   MERGE_STRING_FIELDS(src_policy, dst_policy, setting);
 

tools/traffic_annotation/auditor/traffic_annotation_auditor_ui.cc

@@ -197,9 +197,8 @@ bool WriteAnnotationsFile(const base::FilePath& filepath,
   std::vector<std::string> lines;
   std::string title =
       "Unique ID\tLast Update\tSender\tDescription\tTrigger\tData\t"
-      "Destination\tEmpty Policy Justification\tCookies Allowed\t"
-      "Cookies Store\tSetting\tChrome Policy\tComments\tSource File\t"
-      "ID Hash Code\tContent Hash Code";
+      "Destination\tCookies Allowed\tCookies Store\tSetting\tChrome Policy\t"
+      "Comments\tSource File\tID Hash Code\tContent Hash Code";
 
   for (auto& instance : annotations) {
     if (instance.type != AnnotationInstance::Type::ANNOTATION_COMPLETE)
@@ -250,8 +249,6 @@ bool WriteAnnotationsFile(const base::FilePath& filepath,
 
     // Policy.
     const auto policy = instance.proto.policy();
-    line +=
-        base::StringPrintf("\t%s", policy.empty_policy_justification().c_str());
     line +=
         policy.cookies_allowed() ==
                 traffic_annotation::

tools/traffic_annotation/bin/linux64/traffic_annotation_auditor.sha1

-15452c1f82231c0d5a73ebd9468d36af6735b3f8
+4114b4ddfc462968ff5a4f487c96981cdc1a1eb3
\ No newline at end of file

tools/traffic_annotation/traffic_annotation.proto

@@ -129,11 +129,6 @@ message NetworkTrafficAnnotation {
   TrafficSemantics semantics = 3;
 
   message TrafficPolicy {
-    // Justification for an empty traffic policy.
-    // This can be used for network requests that do not have any traffic
-    // control policy, such as those inside the network stack.
-    string empty_policy_justification = 1;
-
     enum CookiesAllowed {
       // Do not use this value. It's just a placeholder for default value.
       UNSPECIFIED = 0;
@@ -143,7 +138,7 @@ message NetworkTrafficAnnotation {
       // correct).
       YES = 2;
     }
-    CookiesAllowed cookies_allowed = 2;
+    CookiesAllowed cookies_allowed = 1;
 
     // If a request sends or stores cookies/channel IDs/... (i.e. if
     // cookies_allowed is true), we want to know which cookie store is being
@@ -158,20 +153,20 @@ message NetworkTrafficAnnotation {
     //   io_thread()->system_url_request_context_getter()), put "system" here.
     // Otherwise, please explain (e.g. SafeBrowsing uses a separate cookie
     // store).
-    string cookies_store = 3;
+    string cookies_store = 2;
 
     // Human readable description of how to enable/disable a feature that
     // triggers this network request by a user (e.g. “Disable ‘Use a web service
     // to help resolve spelling errors.’ in settings under Advanced”).
-    string setting = 4;
+    string setting = 3;
 
     // Policy configuration(s) that disable or limit this network request.
     // This would be a text serialized protobuf of any enterprise policy.
     // see out/Debug/gen/components/policy/proto/chrome_settings.proto
-    repeated enterprise_management.ChromeSettingsProto chrome_policy = 5;
+    repeated enterprise_management.ChromeSettingsProto chrome_policy = 4;
 
     // Justification for not having a policy that disables this feature.
-    string policy_exception_justification = 6;
+    string policy_exception_justification = 5;
   }
 
   TrafficPolicy policy = 4;