Replace PermissionType in chrome/ with ContentSettingsType

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"
@@ skipping 17 matching lines @@
   DISMISSED = 2,
   IGNORED = 3,
   REVOKED = 4,
   REENABLED = 5,
   REQUESTED = 6,
 
   // Always keep this at the end.
   PERMISSION_ACTION_NUM,
 };
 
-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);
+  // Returns the permission string for the given permission.
+  static std::string GetPermissionString(ContentSettingsType);
+  // TODO(timloh): Remove this function when possible.

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

nit: Same here and below, "when possible" is too vague.

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

Done.

+  static std::string GetPermissionString(content::PermissionType);
 
-  // Return the stringified version of the PermissionType enum that Safe
-  // Browsing uses for the API Blacklist.
-  static std::string ConvertPermissionTypeToSafeBrowsingName(
-      const content::PermissionType& permission_type);
+  // Return the stringified version of the ContentSettingsType enum that
+  // Safe Browsing uses for the API Blacklist.
+  static std::string ConvertContentSettingsTypeToSafeBrowsingName(
+      ContentSettingsType permission);
 
   // Returns the request type corresponding to a permission type.
-  static PermissionRequestType GetRequestType(content::PermissionType type);
+  static PermissionRequestType GetRequestType(ContentSettingsType permission);
 
   // Returns the gesture type corresponding to whether a permission request is
   // made with or without a user gesture.
   static PermissionRequestGestureType GetGestureType(bool user_gesture);
 
-  // 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.
+  // Limited conversion of ContentSettingsType to PermissionType. Returns true
+  // if the conversion was performed.
+  // TODO(timloh): We shouldn't need this, remove this function when possible.
   static bool GetPermissionType(ContentSettingsType type,
                                 content::PermissionType* out);
 
   static bool ShouldShowPersistenceToggle();
 
   // 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).
   class ScopedRevocationReporter {
    public:
@@ skipping 18 matching lines @@
     ContentSettingsType content_type_;
     PermissionSourceUI source_ui_;
     bool is_initially_allowed_;
   };
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionUtil);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UTIL_H_