| Index: content/renderer/media/media_permission_dispatcher_impl.cc
|
| diff --git a/content/renderer/media/media_permission_dispatcher_impl.cc b/content/renderer/media/media_permission_dispatcher_impl.cc
|
| index d8440c24324d7bee68ba0e5e0304d9bc9ffa70ab..d45dc27f90a4506870e5f2e7ed1c488c926eac3f 100644
|
| --- a/content/renderer/media/media_permission_dispatcher_impl.cc
|
| +++ b/content/renderer/media/media_permission_dispatcher_impl.cc
|
| @@ -17,17 +17,17 @@ namespace {
|
|
|
| using Type = media::MediaPermission::Type;
|
|
|
| -content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
|
| +permission::Name MediaPermissionTypeToPermissionName(Type type) {
|
| switch (type) {
|
| case Type::PROTECTED_MEDIA_IDENTIFIER:
|
| - return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
|
| + return permission::NAME_PROTECTED_MEDIA_IDENTIFIER;
|
| case Type::AUDIO_CAPTURE:
|
| - return content::PERMISSION_NAME_AUDIO_CAPTURE;
|
| + return permission::NAME_AUDIO_CAPTURE;
|
| case Type::VIDEO_CAPTURE:
|
| - return content::PERMISSION_NAME_VIDEO_CAPTURE;
|
| + return permission::NAME_VIDEO_CAPTURE;
|
| }
|
| NOTREACHED();
|
| - return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
|
| + return permission::NAME_PROTECTED_MEDIA_IDENTIFIER;
|
| }
|
|
|
| } // namespace
|
| @@ -91,9 +91,9 @@ scoped_ptr<media::MediaPermission> MediaPermissionDispatcherImpl::CreateProxy(
|
|
|
| void MediaPermissionDispatcherImpl::OnPermissionStatus(
|
| uint32_t request_id,
|
| - PermissionStatus status) {
|
| + permission::Status status) {
|
| DCHECK(thread_checker().CalledOnValidThread());
|
| - DeliverResult(request_id, status == PERMISSION_STATUS_GRANTED);
|
| + DeliverResult(request_id, status == permission::STATUS_GRANTED);
|
| }
|
|
|
| } // namespace content
|
|
|