Permission Action Reporting: Bundle report data.

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"
@@ skipping 98 matching lines @@
     case PermissionRequestGestureType::NO_GESTURE:
       return PermissionReport::NO_GESTURE;
     case PermissionRequestGestureType::NUM:
       break;
   }
 
   NOTREACHED();
   return PermissionReport::GESTURE_TYPE_UNSPECIFIED;
 }
 
+PermissionReport::PersistDecision PersistDecisionForReport(
+    PermissionPersistDecision persist_decision) {
+  switch (persist_decision) {
+    case PermissionPersistDecision::UNSPECIFIED:
+      return PermissionReport::PERSIST_DECISION_UNSPECIFIED;
+    case PermissionPersistDecision::PERSISTED:
+      return PermissionReport::PERSISTED;
+    case PermissionPersistDecision::NOT_PERSISTED:
+      return PermissionReport::NOT_PERSISTED;
+  }
+
+  NOTREACHED();
+  return PermissionReport::PERSIST_DECISION_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 10 matching lines @@
           base::WrapUnique(new base::DefaultClock)) {}
 
 PermissionReporter::PermissionReporter(
     std::unique_ptr<net::ReportSender> report_sender,
     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,
-                                    PermissionRequestGestureType gesture_type,
-                                    int num_prior_dismissals,
-                                    int num_prior_ignores) {
-  if (IsReportThresholdExceeded(permission, origin))
+void PermissionReporter::SendReport(const PermissionReportInfo& report_info) {
+  if (IsReportThresholdExceeded(report_info.permission, report_info.origin))
     return;
+
   std::string serialized_report;
-  BuildReport(origin, permission, action, source_ui, gesture_type,
-              num_prior_dismissals, num_prior_ignores, &serialized_report);
+  BuildReport(report_info, &serialized_report);
   permission_report_sender_->Send(GURL(kPermissionActionReportingUploadUrl),
                                   serialized_report);
 }
 
 // static
-bool PermissionReporter::BuildReport(const GURL& origin,
-                                     PermissionType permission,
-                                     PermissionAction action,
-                                     PermissionSourceUI source_ui,
-                                     PermissionRequestGestureType gesture_type,
-                                     int num_prior_dismissals,
-                                     int num_prior_ignores,
+bool PermissionReporter::BuildReport(const PermissionReportInfo& report_info,
                                      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));
-  report.set_gesture(GestureTypeForReport(gesture_type));
-  report.set_num_prior_dismissals(num_prior_dismissals);
-  report.set_num_prior_ignores(num_prior_ignores);
+  report.set_origin(report_info.origin.spec());
+  report.set_permission(PermissionTypeForReport(report_info.permission));
+  report.set_action(PermissionActionForReport(report_info.action));
+  report.set_source_ui(SourceUIForReport(report_info.source_ui));
+  report.set_gesture(GestureTypeForReport(report_info.gesture_type));
+  report.set_persisted(
+      PersistDecisionForReport(report_info.persist_decision));
+  report.set_num_prior_dismissals(report_info.num_prior_dismissals);
+  report.set_num_prior_ignores(report_info.num_prior_ignores);
 
   // 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