Replace PermissionType in chrome/ with ContentSettingsType

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"
 #include "base/macros.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_util.h"
 
 enum class PermissionRequestGestureType;
 class GURL;
 class PermissionRequest;
 class Profile;
 
-namespace content {
-enum class PermissionType;
-}  // namespace content
-
 // This should stay in sync with the SourceUI enum in the permission report
 // protobuf (src/chrome/common/safe_browsing/permission_report.proto).
 enum class PermissionSourceUI {
   PROMPT = 0,
   OIB = 1,
   SITE_SETTINGS = 2,
   PAGE_ACTION = 3,
 
   // Always keep this at the end.
   SOURCE_UI_NUM,
 };
 
 // This should stay in sync with the PersistDecision enum in the permission
 // report message (src/chrome/common/safe_browsing/permission_report.proto).
 enum class PermissionPersistDecision {
   UNSPECIFIED = 0,
   PERSISTED = 1,
   NOT_PERSISTED = 2,
 };
 
 // A bundle for the information sent in a PermissionReport.
 struct PermissionReportInfo {
   PermissionReportInfo(
       const GURL& origin,
-      content::PermissionType permission,
+      ContentSettingsType permission,
       PermissionAction action,
       PermissionSourceUI source_ui,
       PermissionRequestGestureType gesture_type,
       PermissionPersistDecision persist_decision,
       int num_prior_dismissals,
       int num_prior_ignores);
 
   PermissionReportInfo(const PermissionReportInfo& other);
 
   GURL origin;
-  content::PermissionType permission;
+  ContentSettingsType permission;
   PermissionAction action;
   PermissionSourceUI source_ui;
   PermissionRequestGestureType gesture_type;
   PermissionPersistDecision persist_decision;
   int num_prior_dismissals;
   int num_prior_ignores;
 };
 
 // Provides a convenient way of logging UMA for permission related operations.
 class PermissionUmaUtil {
@@ skipping 13 matching lines @@
   static const char kPermissionsPromptMergedBubbleDenied[];
   static const char kPermissionsPromptAcceptedPriorDismissCountPrefix[];
   static const char kPermissionsPromptAcceptedPriorIgnoreCountPrefix[];
   static const char kPermissionsPromptDeniedPriorDismissCountPrefix[];
   static const char kPermissionsPromptDeniedPriorIgnoreCountPrefix[];
   static const char kPermissionsPromptDismissedPriorDismissCountPrefix[];
   static const char kPermissionsPromptDismissedPriorIgnoreCountPrefix[];
   static const char kPermissionsPromptIgnoredPriorDismissCountPrefix[];
   static const char kPermissionsPromptIgnoredPriorIgnoreCountPrefix[];
 
+  // TODO(timloh): Remove this content::PermissionType overload when possible.

[raymes, 2017/02/09 00:39:57]

nit: "when possible" is a bit vague. Could you clarify exactly what would need
to be done?

[Timothy Loh, 2017/02/10 07:25:38]

Done.

   static void PermissionRequested(content::PermissionType permission,
                                   const GURL& requesting_origin,
                                   const GURL& embedding_origin,
                                   Profile* profile);
-  static void PermissionGranted(content::PermissionType permission,
+  static void PermissionRequested(ContentSettingsType permission,
+                                  const GURL& requesting_origin,
+                                  const GURL& embedding_origin,
+                                  Profile* profile);
+  static void PermissionGranted(ContentSettingsType permission,
                                 PermissionRequestGestureType gesture_type,
                                 const GURL& requesting_origin,
                                 Profile* profile);
-  static void PermissionDenied(content::PermissionType permission,
+  static void PermissionDenied(ContentSettingsType permission,
                                PermissionRequestGestureType gesture_type,
                                const GURL& requesting_origin,
                                Profile* profile);
-  static void PermissionDismissed(content::PermissionType permission,
+  static void PermissionDismissed(ContentSettingsType permission,
                                   PermissionRequestGestureType gesture_type,
                                   const GURL& requesting_origin,
                                   Profile* profile);
-  static void PermissionIgnored(content::PermissionType permission,
+  static void PermissionIgnored(ContentSettingsType permission,
                                 PermissionRequestGestureType gesture_type,
                                 const GURL& requesting_origin,
                                 Profile* profile);
-  static void PermissionRevoked(content::PermissionType permission,
+  static void PermissionRevoked(ContentSettingsType permission,
                                 PermissionSourceUI source_ui,
                                 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
   // 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
@@ skipping 27 matching lines @@
       PermissionRequestGestureType gesture_type);
 
   static void RecordPermissionPromptDenied(
       PermissionRequestType request_type,
       PermissionRequestGestureType gesture_type);
 
   // A permission prompt was accepted or denied, and the prompt displayed a
   // persistence toggle. Records whether the toggle was enabled (persist) or
   // disabled (don't persist).
   static void PermissionPromptAcceptedWithPersistenceToggle(
-      content::PermissionType permission,
+      ContentSettingsType permission,
       bool toggle_enabled);
 
   static void PermissionPromptDeniedWithPersistenceToggle(
-      content::PermissionType permission,
+      ContentSettingsType permission,
       bool toggle_enabled);
 
  private:
   friend class PermissionUmaUtilTest;
 
   static bool IsOptedIntoPermissionActionReporting(Profile* profile);
 
-  static void RecordPermissionAction(content::PermissionType permission,
+  static void RecordPermissionAction(ContentSettingsType permission,
                                      PermissionAction action,
                                      PermissionSourceUI source_ui,
                                      PermissionRequestGestureType gesture_type,
                                      const GURL& requesting_origin,
                                      Profile* profile);
 
   // Records |count| total prior actions for a prompt of type |permission|
   // for a single origin using |prefix| for the metric.
   static void RecordPermissionPromptPriorCount(
-      content::PermissionType permission,
+      ContentSettingsType permission,
       const std::string& prefix,
       int count);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUmaUtil);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UMA_UTIL_H_