Permission Action Reporting: Bundle report data.

chrome/browser/permissions/permission_uma_util.cc

 // Copyright 2014 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/permissions/permission_uma_util.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 160 matching lines @@
   } else {
     UMA_HISTOGRAM_ENUMERATION(
         "Permissions.Requested.SameOrigin",
         static_cast<base::HistogramBase::Sample>(permission),
         static_cast<base::HistogramBase::Sample>(PermissionType::NUM));
   }
 }
 
 }  // anonymous namespace
 
+// PermissionReportInfo -------------------------------------------------------
+PermissionReportInfo::PermissionReportInfo(
+    const GURL& origin,
+    PermissionType permission,
+    PermissionAction action,
+    PermissionSourceUI source_ui,
+    PermissionRequestGestureType gesture_type,
+    PermissionPersistDecision persist_decision,
+    int num_prior_dismissals,
+    int num_prior_ignores)
+    : origin(origin), permission(permission), action(action),
+      source_ui(source_ui), gesture_type(gesture_type),
+      persist_decision(persist_decision),
+      num_prior_dismissals(num_prior_dismissals),
+      num_prior_ignores(num_prior_ignores) {}
+
+PermissionReportInfo::PermissionReportInfo(
+    const PermissionReportInfo& other) = default;
+
+// PermissionUmaUtil ----------------------------------------------------------
+
 const char PermissionUmaUtil::kPermissionsPromptShown[] =
     "Permissions.Prompt.Shown";
 const char PermissionUmaUtil::kPermissionsPromptShownGesture[] =
     "Permissions.Prompt.Shown.Gesture";
 const char PermissionUmaUtil::kPermissionsPromptShownNoGesture[] =
     "Permissions.Prompt.Shown.NoGesture";
 const char PermissionUmaUtil::kPermissionsPromptAccepted[] =
     "Permissions.Prompt.Accepted";
 const char PermissionUmaUtil::kPermissionsPromptAcceptedGesture[] =
     "Permissions.Prompt.Accepted.Gesture";
@@ skipping 388 matching lines @@
 }
 
 void PermissionUmaUtil::RecordPermissionAction(
     PermissionType permission,
     PermissionAction action,
     PermissionSourceUI source_ui,
     PermissionRequestGestureType gesture_type,
     const GURL& requesting_origin,
     Profile* profile) {
   if (IsOptedIntoPermissionActionReporting(profile)) {
+    // TODO(kcarattini): Pass in the actual persist decision when it becomes
+    // available.
+    PermissionReportInfo report_info(requesting_origin, permission, action,
+        source_ui, gesture_type, PermissionPersistDecision::UNSPECIFIED,
+        PermissionDecisionAutoBlocker::GetDismissCount(
+            requesting_origin, permission, profile),
+        PermissionDecisionAutoBlocker::GetIgnoreCount(
+            requesting_origin, permission, profile));
     g_browser_process->safe_browsing_service()
-        ->ui_manager()
-        ->ReportPermissionAction(requesting_origin, permission, action,
-            source_ui, gesture_type,
-            PermissionDecisionAutoBlocker::GetDismissCount(
-                requesting_origin, permission, profile),
-            PermissionDecisionAutoBlocker::GetIgnoreCount(
-                requesting_origin, permission, profile));
+        ->ui_manager()->ReportPermissionAction(report_info);
   }
 
   bool secure_origin = content::IsOriginSecure(requesting_origin);
 
   switch (permission) {
     case PermissionType::GEOLOCATION:
       PERMISSION_ACTION_UMA(secure_origin, "Permissions.Action.Geolocation",
                             "Permissions.Action.SecureOrigin.Geolocation",
                             "Permissions.Action.InsecureOrigin.Geolocation",
                             action);
@@ skipping 59 matching lines @@
   if (!deprecated_metric.empty() && rappor_service) {
     rappor::SampleDomainAndRegistryFromGURL(rappor_service, deprecated_metric,
                                             requesting_origin);
 
     std::string rappor_metric = deprecated_metric + "2";
     rappor_service->RecordSample(
         rappor_metric, rappor::LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
         rappor::GetDomainAndRegistrySampleFromGURL(requesting_origin));
   }
 }