| Index: chrome/browser/media/media_permission.cc
|
| diff --git a/chrome/browser/media/media_permission.cc b/chrome/browser/media/media_permission.cc
|
| index 4ba868139af7abe64962af4d0c8c6327c4c2a6ee..aded051f8df2d0afe0ba7ae389e8d2c6c038ddfd 100644
|
| --- a/chrome/browser/media/media_permission.cc
|
| +++ b/chrome/browser/media/media_permission.cc
|
| @@ -7,8 +7,8 @@
|
| #include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| #include "chrome/browser/media/media_stream_device_permission_context.h"
|
| #include "chrome/browser/media/media_stream_device_permissions.h"
|
| -#include "chrome/browser/permissions/permission_context.h"
|
| #include "chrome/browser/permissions/permission_context_base.h"
|
| +#include "chrome/browser/permissions/permission_manager.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "content/public/browser/permission_manager.h"
|
| @@ -54,8 +54,11 @@ ContentSetting MediaPermission::GetPermissionStatus(
|
| // denial reason to kill switch.
|
| content::PermissionType permission_type =
|
| ContentSettingsTypeToPermission(content_type_);
|
| + // TODO(raymes): This calls into GetPermissionContext which is a private
|
| + // member of PermissionManager. Remove this call when this class is refactored
|
| + // into a PermissionContext. See crbug.com/596786.
|
| PermissionContextBase* permission_context =
|
| - PermissionContext::Get(profile_, permission_type);
|
| + PermissionManager::Get(profile_)->GetPermissionContext(permission_type);
|
|
|
| if (!permission_context) {
|
| *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
|
|
|