Add gesture type value from desktop prompt 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 199 matching lines @@
 // Make sure you update histograms.xml permission histogram_suffix if you
 // add new permission
 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,
-                                          Profile* profile) {
+void PermissionUmaUtil::PermissionGranted(
+    PermissionType permission,
+    PermissionRequestGestureType gesture_type,
+    const GURL& requesting_origin,
+    Profile* profile) {
   RecordPermissionAction(permission, GRANTED, PermissionSourceUI::PROMPT,
-                         requesting_origin, profile);
+                         gesture_type, requesting_origin, profile);
 }
 
-void PermissionUmaUtil::PermissionDenied(PermissionType permission,
-                                         const GURL& requesting_origin,
-                                         Profile* profile) {
+void PermissionUmaUtil::PermissionDenied(
+    PermissionType permission,
+    PermissionRequestGestureType gesture_type,
+    const GURL& requesting_origin,
+    Profile* profile) {
   RecordPermissionAction(permission, DENIED, PermissionSourceUI::PROMPT,
-                         requesting_origin, profile);
+                         gesture_type, requesting_origin, profile);
 }
 
-void PermissionUmaUtil::PermissionDismissed(PermissionType permission,
-                                            const GURL& requesting_origin,
-                                            Profile* profile) {
+void PermissionUmaUtil::PermissionDismissed(
+    PermissionType permission,
+    PermissionRequestGestureType gesture_type,
+    const GURL& requesting_origin,
+    Profile* profile) {
   RecordPermissionAction(permission, DISMISSED, PermissionSourceUI::PROMPT,
-                         requesting_origin, profile);
+                         gesture_type, requesting_origin, profile);
 }
 
-void PermissionUmaUtil::PermissionIgnored(PermissionType permission,
-                                          const GURL& requesting_origin,
-                                          Profile* profile) {
+void PermissionUmaUtil::PermissionIgnored(
+    PermissionType permission,
+    PermissionRequestGestureType gesture_type,
+    const GURL& requesting_origin,
+    Profile* profile) {
   RecordPermissionAction(permission, IGNORED, PermissionSourceUI::PROMPT,
-                         requesting_origin, profile);
+                         gesture_type, requesting_origin, profile);
 }
 
 void PermissionUmaUtil::PermissionRevoked(PermissionType permission,
                                           PermissionSourceUI source_ui,
                                           const GURL& revoked_origin,
                                           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, source_ui, revoked_origin,
-                           profile);
+    RecordPermissionAction(permission, REVOKED, source_ui,
+                           PermissionRequestGestureType::UNKNOWN,

[timvolodine, 2016/07/26 14:47:40]

maybe add a comment explaining why this has to be 'unknown'..

[stefanocs, 2016/07/27 03:38:29]

Done.

+                           revoked_origin, profile);
   }
 }
 
 void PermissionUmaUtil::PermissionPromptShown(
     const std::vector<PermissionRequest*>& requests) {
   DCHECK(!requests.empty());
 
   PermissionRequestType permission_prompt_type =
       PermissionRequestType::MULTIPLE;
   PermissionRequestGestureType permission_gesture_type =
@@ skipping 100 matching lines @@
   syncer::ModelTypeSet preferred_data_types =
       profile_sync_service->GetPreferredDataTypes();
   if (!preferred_data_types.Has(syncer::PROXY_TABS))
     return false;
   if (!preferred_data_types.Has(syncer::PRIORITY_PREFERENCES))
     return false;
 
   return true;
 }
 
-void PermissionUmaUtil::RecordPermissionAction(PermissionType permission,
-                                               PermissionAction action,
-                                               PermissionSourceUI source_ui,
-                                               const GURL& requesting_origin,
-                                               Profile* profile) {
+void PermissionUmaUtil::RecordPermissionAction(
+    PermissionType permission,
+    PermissionAction action,
+    PermissionSourceUI source_ui,
+    PermissionRequestGestureType gesture_type,
+    const GURL& requesting_origin,
+    Profile* profile) {
   if (IsOptedIntoPermissionActionReporting(profile)) {
     // TODO(stefanocs): Add browsertests to make sure the reports are being
     // sent.
-    // TODO(stefanocs): Get the actual |user_gesture| from permission layer.
     g_browser_process->safe_browsing_service()
         ->ui_manager()
         ->ReportPermissionAction(requesting_origin, permission, action,
-                                 source_ui,
-                                 PermissionRequestGestureType::UNKNOWN);
+                                 source_ui, gesture_type);
   }
 
   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));
   }
 }