Add user gesture field to permission report

chrome/browser/safe_browsing/permission_reporter_unittest.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 "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/test/simple_test_clock.h"
@@ skipping 89 matching lines @@
   // Owned by |permission_reporter_|.
   base::SimpleTestClock* clock_;
 
   std::unique_ptr<PermissionReporter> permission_reporter_;
 };
 
 // Test that PermissionReporter::SendReport sends a serialized report string to
 // SafeBrowsing CSD servers.
 TEST_F(PermissionReporterTest, SendReport) {
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
 
   PermissionReport permission_report;
   ASSERT_TRUE(
       permission_report.ParseFromString(mock_report_sender_->latest_report()));
   EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission());
   EXPECT_EQ(PermissionReport::GRANTED, permission_report.action());
   EXPECT_EQ(PermissionReport::PROMPT, permission_report.source_ui());
   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());
 #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
     defined(OS_LINUX)
   EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM,
             permission_report.platform_type());
 #endif
 
   EXPECT_EQ(GURL(kPermissionActionReportingUploadUrl),
             mock_report_sender_->latest_report_uri());
 }
 
 // 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>
       ActiveGroupIdSet;
 
   // Add and activate dummy field trials.
   base::FieldTrialList field_trial_list(nullptr);
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   base::FieldTrial* trial_one =
       base::FieldTrialList::CreateFieldTrial(kDummyTrialOne, kDummyGroupOne);
@@ skipping 11 matching lines @@
   base::FeatureList::SetInstance(std::move(feature_list));
 
   // This is necessary to activate both field trials.
   base::FeatureList::IsEnabled(kFeatureOnByDefault);
   base::FeatureList::IsEnabled(kFeatureOffByDefault);
 
   EXPECT_TRUE(base::FieldTrialList::IsTrialActive(trial_one->trial_name()));
   EXPECT_TRUE(base::FieldTrialList::IsTrialActive(trial_two->trial_name()));
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
 
   PermissionReport permission_report;
   ASSERT_TRUE(
       permission_report.ParseFromString(mock_report_sender_->latest_report()));
 
   variations::ActiveGroupId field_trial_one =
       variations::MakeActiveGroupId(kDummyTrialOne, kDummyGroupOne);
   variations::ActiveGroupId field_trial_two =
       variations::MakeActiveGroupId(kDummyTrialTwo, kDummyGroupTwo);
   ActiveGroupIdSet expected_group_ids = {field_trial_one, field_trial_two};
 
   EXPECT_EQ(2, permission_report.field_trials().size());
   for (auto field_trial : permission_report.field_trials()) {
     variations::ActiveGroupId group_id = {field_trial.name_id(),
                                           field_trial.group_id()};
     EXPECT_EQ(1U, expected_group_ids.erase(group_id));
   }
   EXPECT_EQ(0U, expected_group_ids.size());
 }
 
 // Test that PermissionReporter::IsReportThresholdExceeded returns false only
 // when the number of reports sent in the last one minute per origin per
 // permission is under a threshold.
 TEST_F(PermissionReporterTest, IsReportThresholdExceeded) {
   EXPECT_EQ(0, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   int reports_to_send = kMaximumReportsPerOriginPerPermissionPerMinute;
   while (reports_to_send--)
     permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                     kDummyAction, kDummySourceUI);
+                                     kDummyAction, kDummySourceUI,
+                                     false /* user_gesture */);
   EXPECT_EQ(5, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
   EXPECT_EQ(0, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionTwo,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   permission_reporter_->SendReport(GURL(kDummyOriginTwo), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMinutes(1));
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
   EXPECT_EQ(0, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMicroseconds(1));
   permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                   kDummyAction, kDummySourceUI);
+                                   kDummyAction, kDummySourceUI,
+                                   false /* user_gesture */);
   EXPECT_EQ(1, mock_report_sender_->GetAndResetNumberOfReportsSent());
 
   clock_->Advance(base::TimeDelta::FromMinutes(1));
   reports_to_send = 12;
   while (reports_to_send--) {
     clock_->Advance(base::TimeDelta::FromSeconds(5));
     permission_reporter_->SendReport(GURL(kDummyOriginOne), kDummyPermissionOne,
-                                     kDummyAction, kDummySourceUI);
+                                     kDummyAction, kDummySourceUI,
+                                     false /* user_gesture */);
   }
   EXPECT_EQ(kMaximumReportsPerOriginPerPermissionPerMinute,
             mock_report_sender_->GetAndResetNumberOfReportsSent());
 }
 
 }  // namespace safe_browsing