Add SourceUI field to permission report

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 178 matching lines @@
 void PermissionUmaUtil::PermissionRequested(PermissionType permission,
                                             const GURL& requesting_origin,
                                             const GURL& embedding_origin,
                                             Profile* profile) {
   RecordPermissionRequest(permission, requesting_origin, embedding_origin,
                           profile);
 }
 
 void PermissionUmaUtil::PermissionGranted(PermissionType permission,
                                           const GURL& requesting_origin,
+                                          SourceUI source_ui,
                                           Profile* profile) {
-  RecordPermissionAction(permission, GRANTED, requesting_origin, profile);
+  RecordPermissionAction(permission, GRANTED, requesting_origin, source_ui,
+                         profile);
 }
 
 void PermissionUmaUtil::PermissionDenied(PermissionType permission,
                                          const GURL& requesting_origin,
+                                         SourceUI source_ui,
                                          Profile* profile) {
-  RecordPermissionAction(permission, DENIED, requesting_origin, profile);
+  RecordPermissionAction(permission, DENIED, requesting_origin, source_ui,
+                         profile);
 }
 
 void PermissionUmaUtil::PermissionDismissed(PermissionType permission,
                                             const GURL& requesting_origin,
+                                            SourceUI source_ui,
                                             Profile* profile) {
-  RecordPermissionAction(permission, DISMISSED, requesting_origin, profile);
+  RecordPermissionAction(permission, DISMISSED, requesting_origin, source_ui,
+                         profile);
 }
 
 void PermissionUmaUtil::PermissionIgnored(PermissionType permission,
                                           const GURL& requesting_origin,
+                                          SourceUI source_ui,
                                           Profile* profile) {
-  RecordPermissionAction(permission, IGNORED, requesting_origin, profile);
+  RecordPermissionAction(permission, IGNORED, requesting_origin, source_ui,
+                         profile);
 }
 
 void PermissionUmaUtil::PermissionRevoked(PermissionType permission,
                                           const GURL& revoked_origin,
+                                          SourceUI source_ui,

[kcarattini, 2016/07/06 06:54:08]

Add a TODO to add reporting for revocations from the Page Action bubbles.

[stefanocs, 2016/07/07 01:26:03]

Done. Revocations from the Page Action bubbles had been recorded but it is
considered as SITE_SETTINGS in this CL
(chrome/browser/permissions/permission_util.cc). So I added a comment below.

                                           Profile* profile) {
   // TODO(tsergeant): Expand metrics definitions for revocation to include all
   // permissions.
   if (permission == PermissionType::NOTIFICATIONS ||
       permission == PermissionType::GEOLOCATION ||
       permission == PermissionType::AUDIO_CAPTURE ||
       permission == PermissionType::VIDEO_CAPTURE) {
-    RecordPermissionAction(permission, REVOKED, revoked_origin, profile);
+    RecordPermissionAction(permission, REVOKED, revoked_origin, source_ui,
+                           profile);
   }
 }
 
 void PermissionUmaUtil::PermissionPromptShown(
     const std::vector<PermissionBubbleRequest*>& requests) {
   DCHECK(!requests.empty());
 
   PermissionBubbleType permission_prompt_type = PermissionBubbleType::MULTIPLE;
   if (requests.size() == 1)
     permission_prompt_type = requests[0]->GetPermissionBubbleType();
@@ skipping 91 matching lines @@
     return false;
   // Do not report if Chrome Pref Sync is not enabled.
   if (!preferred_data_types.Has(syncer::PREFERENCES))
     return false;
   return true;
 }
 
 void PermissionUmaUtil::RecordPermissionAction(PermissionType permission,
                                                PermissionAction action,
                                                const GURL& requesting_origin,
+                                               SourceUI source_ui,
                                                Profile* profile) {
   // Send permission action report to opted-in users.
   if (IsOptedInPermissionActionReporting(profile)) {
     g_browser_process->safe_browsing_service()
         ->ui_manager()
-        ->ReportPermissionAction(requesting_origin, permission, action);
+        ->ReportPermissionAction(requesting_origin, permission, action,
+                                 source_ui);
   }
 
   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));
   }
 }