Revert of Add hooks to permission layer for permission action reporting

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 33 matching lines @@
   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);
+                                const GURL& requesting_origin);
   static void PermissionDenied(content::PermissionType permission,
-                               const GURL& requesting_origin,
-                               Profile* profile);
+                               const GURL& requesting_origin);
   static void PermissionDismissed(content::PermissionType permission,
-                                  const GURL& requesting_origin,
-                                  Profile* profile);
+                                  const GURL& requesting_origin);
   static void PermissionIgnored(content::PermissionType permission,
-                                const GURL& requesting_origin,
-                                Profile* profile);
+                                const GURL& requesting_origin);
   static void PermissionRevoked(content::PermissionType permission,
-                                const GURL& revoked_origin,
-                                Profile* profile);
+                                const GURL& revoked_origin);
 
   // 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
   //   unclear from those metrics alone how many prompts are seen by users.
   static void PermissionPromptShown(
       const std::vector<PermissionBubbleRequest*>& requests);
 
   // The following two functions can be combined with the PermissionPromptShown
   // metrics to calculate accept, deny and ignore rates.
   // Note that for coalesced permission bubbles, PermissionPromptAccepted will
   // always be called, with |accept_states| containing whether each request was
   // accepted or denied.
   static void PermissionPromptAccepted(
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_states);
 
   static void PermissionPromptDenied(
       const std::vector<PermissionBubbleRequest*>& requests);
 
  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,
-                                     Profile* profile);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_