| Index: chrome/browser/media/midi_permission_context.cc
|
| diff --git a/chrome/browser/media/midi_permission_context.cc b/chrome/browser/media/midi_permission_context.cc
|
| index f4987df5d2c54a491553fd3fb8bd0354fb529a71..e02d4e63bb77015ede8ceff9e284b2a84515722a 100644
|
| --- a/chrome/browser/media/midi_permission_context.cc
|
| +++ b/chrome/browser/media/midi_permission_context.cc
|
| @@ -8,7 +8,7 @@
|
| #include "chrome/browser/permissions/permission_request_id.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| #include "content/public/browser/permission_type.h"
|
| -#include "url/gurl.h"
|
| +#include "url/origin.h"
|
|
|
| MidiPermissionContext::MidiPermissionContext(Profile* profile)
|
| : PermissionContextBase(profile,
|
| @@ -18,22 +18,24 @@ MidiPermissionContext::MidiPermissionContext(Profile* profile)
|
| MidiPermissionContext::~MidiPermissionContext() {
|
| }
|
|
|
| -void MidiPermissionContext::UpdateTabContext(const PermissionRequestID& id,
|
| - const GURL& requesting_frame,
|
| - bool allowed) {
|
| +void MidiPermissionContext::UpdateTabContext(
|
| + const PermissionRequestID& id,
|
| + const url::Origin& requesting_frame,
|
| + bool allowed) {
|
| TabSpecificContentSettings* content_settings =
|
| TabSpecificContentSettings::GetForFrame(id.render_process_id(),
|
| id.render_frame_id());
|
| if (!content_settings)
|
| return;
|
|
|
| + const GURL requesting_url(requesting_frame.Serialize());
|
| if (allowed) {
|
| - content_settings->OnMidiSysExAccessed(requesting_frame);
|
| + content_settings->OnMidiSysExAccessed(requesting_url);
|
|
|
| content::ChildProcessSecurityPolicy::GetInstance()->
|
| GrantSendMidiSysExMessage(id.render_process_id());
|
| } else {
|
| - content_settings->OnMidiSysExAccessBlocked(requesting_frame);
|
| + content_settings->OnMidiSysExAccessBlocked(GURL(requesting_url));
|
| }
|
| }
|
|
|
|
|