Add revocation metrics from OIB and content setting

chrome/browser/permissions/permission_util.h

 // Copyright 2015 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_UTIL_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_UTIL_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "url/gurl.h"
 
+class HostContentSettingsMap;
 class Profile;
 
 namespace content {
 enum class PermissionType;
 }  // namespace content
 
 enum class PermissionSourceUI;
 
 struct PermissionTypeHash {
   std::size_t operator()(const content::PermissionType& type) const;
 };
 
 // A utility class for permissions.
 class PermissionUtil {
  public:
   // Returns the permission string for the given PermissionType.
   static std::string GetPermissionString(content::PermissionType permission);
 
   // Limited conversion of ContentSettingsType to PermissionType. Intended for
   // recording Permission UMA metrics from areas of the codebase which have not
   // yet been converted to PermissionType. Returns true if the conversion was
   // performed.
   // TODO(tsergeant): Remove this function once callsites operate on
   // PermissionType directly.
   static bool GetPermissionType(ContentSettingsType type,
                                 content::PermissionType* out);
 
   // A scoped class that will check the current resolved content setting on
   // construction and report a revocation metric accordingly if the revocation
-  // condition is met (from ALLOW to something else).
+  // condition is met (from ALLOW to something else). By default,
+  // |settings_map_| is obtained from |profile_|, but it can be changed with the
+  // setter if necessary.
   class ScopedRevocationReporter {
    public:
     ScopedRevocationReporter(Profile* profile,
                              const GURL& primary_url,
                              const GURL& secondary_url,
                              ContentSettingsType content_type,
                              PermissionSourceUI source_ui);
 
+    ScopedRevocationReporter(Profile* profile,
+                             const ContentSettingsPattern& primary_pattern,
+                             const ContentSettingsPattern& secondary_pattern,
+                             ContentSettingsType content_type,
+                             PermissionSourceUI source_ui);
+
+    void SetCustomSettingsMap(HostContentSettingsMap* settings_map);
+
     ~ScopedRevocationReporter();
 
    private:
     Profile* profile_;
+    HostContentSettingsMap* settings_map_;
     const GURL primary_url_;
     const GURL secondary_url_;
     ContentSettingsType content_type_;
     PermissionSourceUI source_ui_;
     bool is_initially_allowed_;
   };
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUtil);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UTIL_H_