Add ruleId field to SafeBrowsingPrivateEventRouter DLP events

This adds the ruleId field in triggered rules for DLP events, which
seems to have been omitted by mistake.

Change-Id: I468704163e49c1853ea4ba8b7f5432ddc53f933f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521244Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825335}

chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc

@@ -80,6 +80,9 @@ void AddAnalysisConnectorVerdictToEvent(
     triggered_rule.SetStringKey(
         extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName,
         trigger.rule_name());
+    triggered_rule.SetStringKey(
+        extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId,
+        trigger.rule_id());
 
     triggered_rule_info.Append(std::move(triggered_rule));
   }
@@ -121,6 +124,7 @@ const char SafeBrowsingPrivateEventRouter::kKeyNetErrorCode[] = "netErrorCode";
 const char SafeBrowsingPrivateEventRouter::kKeyClickedThrough[] =
     "clickedThrough";
 const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName[] = "ruleName";
+const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId[] = "ruleId";
 const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleInfo[] =
     "triggeredRuleInfo";
 const char SafeBrowsingPrivateEventRouter::kKeyThreatType[] = "threatType";

chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.h

@@ -73,6 +73,7 @@ class SafeBrowsingPrivateEventRouter
   static const char kKeyNetErrorCode[];
   static const char kKeyClickedThrough[];
   static const char kKeyTriggeredRuleName[];
+  static const char kKeyTriggeredRuleId[];
   static const char kKeyTriggeredRuleInfo[];
   static const char kKeyThreatType[];
   static const char kKeyContentType[];

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.cc

@@ -402,6 +402,8 @@ void EventReportValidator::ValidateDlpRule(
         expected_rule) {
   ValidateField(value, SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName,
                 expected_rule.rule_name());
+  ValidateField(value, SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId,
+                expected_rule.rule_id());
 }
 
 void EventReportValidator::ValidateField(