Remove unused PermissionRequestType::MEDIA_STREAM/UNUSED_PERMISSION

Change-Id: I219a0dfc48e834e55b35e376378fd3775fff6ee0 Reviewed-on: https://chromium-review.googlesource.com/821331 Reviewed-by: Raymes Khoury <raymes@chromium.org> Commit-Queue: Timothy Loh <timloh@chromium.org> Cr-Commit-Position: refs/heads/master@{#523355}
qweri0p · Dec 12, 2017 · bbd67f7 · bbd67f7
1 parent 3ada8cb
commit bbd67f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/chrome/browser/permissions/permission_request.h b/chrome/browser/permissions/permission_request.h
@@ -24,10 +24,10 @@ struct VectorIcon;
 enum class PermissionRequestType {
   UNKNOWN = 0,
   MULTIPLE = 1,
-  UNUSED_PERMISSION = 2,
+  // UNUSED_PERMISSION = 2,
   QUOTA = 3,
   DOWNLOAD = 4,
-  MEDIA_STREAM = 5,
+  // MEDIA_STREAM = 5,
   REGISTER_PROTOCOL_HANDLER = 6,
   PERMISSION_GEOLOCATION = 7,
   PERMISSION_MIDI_SYSEX = 8,

diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc
@@ -105,11 +105,6 @@ void RecordEngagementMetric(const std::vector<PermissionRequest*>& requests,
   if (requests.size() > 1)
     type = PermissionRequestType::MULTIPLE;
 
-  // This is only hit if kUsePermissionManagerForMediaRequests is off, since it
-  // is now on by default we'll just silenty drop this.
-  if (type == PermissionRequestType::MEDIA_STREAM)
-    return;
-
   DCHECK(action == "Accepted" || action == "Denied" || action == "Dismissed" ||
          action == "Ignored");
   std::string name = "Permissions.Engagement." + action + '.' +