Add SourceUI field to permission report

chrome/browser/permissions/permission_uma_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_
 
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 17 matching lines @@
   DISMISSED = 2,
   IGNORED = 3,
   REVOKED = 4,
   REENABLED = 5,
   REQUESTED = 6,
 
   // Always keep this at the end.
   PERMISSION_ACTION_NUM,
 };
 
+// This should stay in sync with the SourceUI enum in the permission report
+// protobuf (src/chrome/common/safe_browsing/permission_report.proto).
+enum SourceUI {

[raymes, 2016/07/12 07:18:14]

nit: I think we should call this PermissionSourceUI. 

Also, consider using an enum class here. It will make the enum values less
ambiguous when they are used (e.g. they will become PermissionSourceUI::OIB
instead of just OIB).

[stefanocs, 2016/07/13 01:23:52]

Done.

+  PROMPT = 0,
+  OIB = 1,
+  SITE_SETTINGS = 2,
+  PAGE_ACTION = 3,
+
+  // Always keep this at the end.
+  SOURCE_UI_NUM,
+};
+
 // Provides a convenient way of logging UMA for permission related operations.
 class PermissionUmaUtil {
  public:
   static const char kPermissionsPromptShown[];
   static const char kPermissionsPromptAccepted[];
   static const char kPermissionsPromptDenied[];
   static const char kPermissionsPromptRequestsPerPrompt[];
   static const char kPermissionsPromptMergedBubbleTypes[];
   static const char kPermissionsPromptMergedBubbleAccepted[];
   static const char kPermissionsPromptMergedBubbleDenied[];
 
   static void PermissionRequested(content::PermissionType permission,
                                   const GURL& requesting_origin,
                                   const GURL& embedding_origin,
                                   Profile* profile);
   static void PermissionGranted(content::PermissionType permission,
                                 const GURL& requesting_origin,
                                 Profile* profile);
   static void PermissionDenied(content::PermissionType permission,
                                const GURL& requesting_origin,
                                Profile* profile);
   static void PermissionDismissed(content::PermissionType permission,
                                   const GURL& requesting_origin,
                                   Profile* profile);
   static void PermissionIgnored(content::PermissionType permission,
                                 const GURL& requesting_origin,
                                 Profile* profile);
   static void PermissionRevoked(content::PermissionType permission,
                                 const GURL& revoked_origin,
+                                SourceUI source_ui,
                                 Profile* profile);
 
   // UMA specifically for when permission prompts are shown. This should be
   // roughly equivalent to the metrics above, however it is
   // useful to have separate UMA to a few reasons:
   // - to account for, and get data on coalesced permission bubbles
   // - there are other types of permissions prompts (e.g. download limiting)
   //   which don't go through PermissionContext
   // - the above metrics don't always add up (e.g. sum of
   //   granted+denied+dismissed+ignored is not equal to requested), so it is
@@ skipping 16 matching lines @@
  private:
   friend class PermissionUmaUtilTest;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUmaUtil);
 
   static bool IsOptedIntoPermissionActionReporting(Profile* profile);
 
   static void RecordPermissionAction(content::PermissionType permission,
                                      PermissionAction action,
                                      const GURL& requesting_origin,
+                                     SourceUI source_ui,

[raymes, 2016/07/12 07:18:14]

nit: I think this should go before the origin (grouped with the
PermissionAction)

[stefanocs, 2016/07/13 01:23:52]

Done.

                                      Profile* profile);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_