Make media permission requests go through the PermissionManager

chrome/browser/permissions/permission_util.cc

 // 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.
 
 #include "chrome/browser/permissions/permission_util.h"
 
 #include "build/build_config.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 76 matching lines @@
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return PermissionRequestType::PERMISSION_NOTIFICATIONS;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       return PermissionRequestType::PERMISSION_MIDI_SYSEX;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       return PermissionRequestType::PERMISSION_PUSH_MESSAGING;
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       return PermissionRequestType::PERMISSION_FLASH;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+      return PermissionRequestType::PERMISSION_MEDIASTREAM_MIC;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
+      return PermissionRequestType::PERMISSION_MEDIASTREAM_CAMERA;
     default:
       NOTREACHED();
       return PermissionRequestType::UNKNOWN;
   }
 }
 
 PermissionRequestGestureType PermissionUtil::GetGestureType(bool user_gesture) {
   return user_gesture ? PermissionRequestGestureType::GESTURE
                       : PermissionRequestGestureType::NO_GESTURE;
 }
@@ skipping 98 matching lines @@
     return;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSetting final_content_setting = settings_map->GetContentSetting(
       primary_url_, secondary_url_, content_type_, std::string());
   if (final_content_setting != CONTENT_SETTING_ALLOW) {
     PermissionUmaUtil::PermissionRevoked(content_type_, source_ui_,
                                          primary_url_, profile_);
   }
 }