Update RequestTrigger to GestureType in permission report

chrome/browser/safe_browsing/permission_reporter_unittest.cc

Index: chrome/browser/safe_browsing/permission_reporter_unittest.cc
diff --git a/chrome/browser/safe_browsing/permission_reporter_unittest.cc b/chrome/browser/safe_browsing/permission_reporter_unittest.cc
index 1932accd3db8e8c4ea0b61f9a25f676212ec7a6f..dfd3cd7b8d227b1459f722ebdf90f39e30507aee 100644
--- a/chrome/browser/safe_browsing/permission_reporter_unittest.cc
+++ b/chrome/browser/safe_browsing/permission_reporter_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/time.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"
@@ -34,6 +35,8 @@ const PermissionType kDummyPermissionOne = PermissionType::GEOLOCATION;
 const PermissionType kDummyPermissionTwo = PermissionType::NOTIFICATIONS;
 const PermissionAction kDummyAction = GRANTED;
 const PermissionSourceUI kDummySourceUI = PermissionSourceUI::PROMPT;
+const PermissionRequestGestureType kDummyGestureType =
+    PermissionRequestGestureType::GESTURE;
 
 const char kDummyTrialOne[] = "trial one";
 const char kDummyGroupOne[] = "group one";
@@ -108,7 +111,7 @@ class PermissionReporterTest : public ::testing::Test {
 TEST_F(PermissionReporterTest, SendReport) {
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
 
   PermissionReport permission_report;
   ASSERT_TRUE(
@@ -116,8 +119,8 @@ TEST_F(PermissionReporterTest, SendReport) {
   EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission());
   EXPECT_EQ(PermissionReport::GRANTED, permission_report.action());
   EXPECT_EQ(PermissionReport::PROMPT, permission_report.source_ui());
+  EXPECT_EQ(PermissionReport::GESTURE, permission_report.gesture());
   EXPECT_EQ(kDummyOriginOne, permission_report.origin());
-  EXPECT_TRUE(permission_report.request_trigger().empty());
 #if defined(OS_ANDROID)
   EXPECT_EQ(PermissionReport::ANDROID_PLATFORM,
             permission_report.platform_type());
@@ -132,22 +135,6 @@ TEST_F(PermissionReporterTest, SendReport) {
 }
 
 // Test that PermissionReporter::SendReport sends a serialized report string
-// with request trigger to SafeBrowsing CSD servers.
-TEST_F(PermissionReporterTest, SendReportWithRequestTrigger) {
-  permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI,
-                                   true /* user_gesture */);
-
-  PermissionReport permission_report;
-  ASSERT_TRUE(
-      permission_report.ParseFromString(mock_report_sender_->latest_report()));
-  EXPECT_EQ(1, permission_report.request_trigger().size());
-  EXPECT_EQ(PermissionReport::AFTER_GESTURE,
-            static_cast<PermissionReport::RequestTrigger>(
-                permission_report.request_trigger(0)));
-}
-
-// Test that PermissionReporter::SendReport sends a serialized report string
 // with field trials to SafeBrowsing CSD servers.
 TEST_F(PermissionReporterTest, SendReportWithFieldTrials) {
   typedef std::set<variations::ActiveGroupId, variations::ActiveGroupIdCompare>
@@ -180,7 +167,7 @@ TEST_F(PermissionReporterTest, SendReportWithFieldTrials) {
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
 
   PermissionReport permission_report;
   ASSERT_TRUE(
@@ -211,34 +198,34 @@ TEST_F(PermissionReporterTest, IsReportThresholdExceeded) {
   while (reports_to_send--)
     permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                      kDummyAction, kDummySourceUI,
-                                     false /* user_gesture */);
+                                     kDummyGestureType);
   EXPECT_EQ(5, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
   EXPECT_EQ(0, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionTwo,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginTwo), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMinutes(1));
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
   EXPECT_EQ(0, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMicroseconds(1));
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                    kDummyAction, kDummySourceUI,
-                                   false /* user_gesture */);
+                                   kDummyGestureType);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMinutes(1));
@@ -247,7 +234,7 @@ TEST_F(PermissionReporterTest, IsReportThresholdExceeded) {
     clock_->Advance(base::TimeDelta::FromSeconds(5));
     permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
                                      kDummyAction, kDummySourceUI,
-                                     false /* user_gesture */);
+                                     kDummyGestureType);
   }
   EXPECT_EQ(kMaximumReportsPerOriginPerPermissionPerMinute,
             mock_report_sender_->GetAndResetNumberOfReportsSent());