Update RequestTrigger to GestureType in permission report

chrome/browser/safe_browsing/permission_reporter.cc

Index: chrome/browser/safe_browsing/permission_reporter.cc
diff --git a/chrome/browser/safe_browsing/permission_reporter.cc b/chrome/browser/safe_browsing/permission_reporter.cc
index 31ee67908b0368c13f73cbbb3faa0431568f5973..2eb3eff39e5f3022e99273809b80f22ecac3f989 100644
--- a/chrome/browser/safe_browsing/permission_reporter.cc
+++ b/chrome/browser/safe_browsing/permission_reporter.cc
@@ -9,6 +9,7 @@
 #include "base/hash.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/default_clock.h"
+#include "chrome/browser/permissions/permission_request.h"
 #include "chrome/common/safe_browsing/permission_report.pb.h"
 #include "components/variations/active_field_trials.h"
 #include "content/public/browser/permission_type.h"
@@ -98,6 +99,23 @@ PermissionReport::SourceUI SourceUIForReport(PermissionSourceUI source_ui) {
   return PermissionReport::SOURCE_UI_UNSPECIFIED;
 }
 
+PermissionReport::GestureType GestureTypeForReport(
+    PermissionRequestGestureType gesture_type) {
+  switch (gesture_type) {
+    case PermissionRequestGestureType::UNKNOWN:
+      return PermissionReport::GESTURE_TYPE_UNSPECIFIED;
+    case PermissionRequestGestureType::GESTURE:
+      return PermissionReport::GESTURE;
+    case PermissionRequestGestureType::NO_GESTURE:
+      return PermissionReport::NO_GESTURE;
+    case PermissionRequestGestureType::NUM:
+      break;
+  }
+
+  NOTREACHED();
+  return PermissionReport::GESTURE_TYPE_UNSPECIFIED;
+}
+
 }  // namespace
 
 bool PermissionAndOrigin::operator==(const PermissionAndOrigin& other) const {
@@ -132,11 +150,11 @@ void PermissionReporter::SendReport(const GURL& origin,
                                     content::PermissionType permission,
                                     PermissionAction action,
                                     PermissionSourceUI source_ui,
-                                    bool user_gesture) {
+                                    PermissionRequestGestureType gesture_type) {
   if (IsReportThresholdExceeded(permission, origin))
     return;
   std::string serialized_report;
-  BuildReport(origin, permission, action, source_ui, user_gesture,
+  BuildReport(origin, permission, action, source_ui, gesture_type,
               &serialized_report);
   permission_report_sender_->Send(GURL(kPermissionActionReportingUploadUrl),
                                   serialized_report);
@@ -147,15 +165,14 @@ bool PermissionReporter::BuildReport(const GURL& origin,
                                      PermissionType permission,
                                      PermissionAction action,
                                      PermissionSourceUI source_ui,
-                                     bool user_gesture,
+                                     PermissionRequestGestureType gesture_type,
                                      std::string* output) {
   PermissionReport report;
   report.set_origin(origin.spec());
   report.set_permission(PermissionTypeForReport(permission));
   report.set_action(PermissionActionForReport(action));
   report.set_source_ui(SourceUIForReport(source_ui));
-  if (user_gesture)
-    report.add_request_trigger(PermissionReport::AFTER_GESTURE);
+  report.set_gesture(GestureTypeForReport(gesture_type));
 
   // Collect platform data.
 #if defined(OS_ANDROID)