Permission Action Reporting: Bundle report data.

chrome/browser/safe_browsing/ui_manager.cc

Index: chrome/browser/safe_browsing/ui_manager.cc
diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc
index 538b160f8dd9ce525221b1156e20d87fa37becb6..cfb91cc27255ead1de1155bd6234d33a5fee8b16 100644
--- a/chrome/browser/safe_browsing/ui_manager.cc
+++ b/chrome/browser/safe_browsing/ui_manager.cc
@@ -286,19 +286,12 @@ void SafeBrowsingUIManager::ReportInvalidCertificateChain(
 }
 
 void SafeBrowsingUIManager::ReportPermissionAction(
-    const GURL& origin,
-    content::PermissionType permission,
-    PermissionAction action,
-    PermissionSourceUI source_ui,
-    PermissionRequestGestureType gesture_type,
-    int num_prior_dismissals,
-    int num_prior_ignores) {
+    const PermissionReportInfo& report_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingUIManager::ReportPermissionActionOnIOThread, this,
-                 origin, permission, action, source_ui, gesture_type,
-                 num_prior_dismissals, num_prior_ignores));
+                 report_info));
 }
 
 void SafeBrowsingUIManager::AddObserver(Observer* observer) {
@@ -324,13 +317,7 @@ void SafeBrowsingUIManager::ReportInvalidCertificateChainOnIOThread(
 }
 
 void SafeBrowsingUIManager::ReportPermissionActionOnIOThread(
-    const GURL& origin,
-    content::PermissionType permission,
-    PermissionAction action,
-    PermissionSourceUI source_ui,
-    PermissionRequestGestureType gesture_type,
-    int num_prior_dismissals,
-    int num_prior_ignores) {
+    const PermissionReportInfo& report_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // The service may delete the ping manager (i.e. when user disabling service,
@@ -338,9 +325,7 @@ void SafeBrowsingUIManager::ReportPermissionActionOnIOThread(
   if (!sb_service_ || !sb_service_->ping_manager())
     return;
 
-  sb_service_->ping_manager()->ReportPermissionAction(
-      origin, permission, action, source_ui, gesture_type, num_prior_dismissals,
-      num_prior_ignores);
+  sb_service_->ping_manager()->ReportPermissionAction(report_info);
 }
 
 // If the user had opted-in to send ThreatDetails, this gets called