Update RequestTrigger to GestureType in permission report

chrome/browser/safe_browsing/permission_reporter.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/permission_reporter.h"
 
 #include <functional>
 
 #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"
 #include "net/url_request/report_sender.h"
 
 using content::PermissionType;
 
 namespace safe_browsing {
 
 namespace {
@@ skipping 69 matching lines @@
     case PermissionSourceUI::PAGE_ACTION:
       return PermissionReport::PAGE_ACTION;
     case PermissionSourceUI::SOURCE_UI_NUM:
       break;
   }
 
   NOTREACHED();
   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 {
   return (permission == other.permission && origin == other.origin);
 }
 
 std::size_t PermissionAndOriginHash::operator()(
     const PermissionAndOrigin& permission_and_origin) const {
   std::size_t permission_hash =
       static_cast<std::size_t>(permission_and_origin.permission);
@@ skipping 14 matching lines @@
     std::unique_ptr<base::Clock> clock)
     : permission_report_sender_(std::move(report_sender)),
       clock_(std::move(clock)) {}
 
 PermissionReporter::~PermissionReporter() {}
 
 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);
 }
 
 // static
 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)
   report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
 #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
     defined(OS_LINUX)
   report.set_platform_type(PermissionReport::DESKTOP_PLATFORM);
 #else
 #error Unsupported platform.
 #endif
@@ skipping 21 matching lines @@
   }
   if (log.size() < kMaximumReportsPerOriginPerPermissionPerMinute) {
     log.push(current_time);
     return false;
   } else {
     return true;
   }
 }
 
 }  // namespace safe_browsing