Reland add hooks to permission layer for permission action reporting

chrome/browser/permissions/permission_uma_util.h

Index: chrome/browser/permissions/permission_uma_util.h
diff --git a/chrome/browser/permissions/permission_uma_util.h b/chrome/browser/permissions/permission_uma_util.h
index f16361737f09855b8c60492354361cddbffb109f..bdb8c72648761b906a79f73956c44004c83f39ca 100644
--- a/chrome/browser/permissions/permission_uma_util.h
+++ b/chrome/browser/permissions/permission_uma_util.h
@@ -51,15 +51,20 @@ class PermissionUmaUtil {
                                   const GURL& embedding_origin,
                                   Profile* profile);
   static void PermissionGranted(content::PermissionType permission,
-                                const GURL& requesting_origin);
+                                const GURL& requesting_origin,
+                                Profile* profile);
   static void PermissionDenied(content::PermissionType permission,
-                               const GURL& requesting_origin);
+                               const GURL& requesting_origin,
+                               Profile* profile);
   static void PermissionDismissed(content::PermissionType permission,
-                                  const GURL& requesting_origin);
+                                  const GURL& requesting_origin,
+                                  Profile* profile);
   static void PermissionIgnored(content::PermissionType permission,
-                                const GURL& requesting_origin);
+                                const GURL& requesting_origin,
+                                Profile* profile);
   static void PermissionRevoked(content::PermissionType permission,
-                                const GURL& revoked_origin);
+                                const GURL& revoked_origin,
+                                Profile* profile);
 
   // UMA specifically for when permission prompts are shown. This should be
   // roughly equivalent to the metrics above, however it is
@@ -86,6 +91,15 @@ class PermissionUmaUtil {
       const std::vector<PermissionBubbleRequest*>& requests);
 
  private:
+  friend class PermissionUmaUtilTest;
+
+  static bool IsOptedIntoPermissionActionReporting(Profile* profile);
+
+  static void RecordPermissionAction(content::PermissionType permission,
+                                     PermissionAction action,
+                                     const GURL& requesting_origin,
+                                     Profile* profile);
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUmaUtil);
 };