Refactor content client to include a single Request/CancelPermission method.

content/browser/media/midi_dispatcher_host.cc

Index: content/browser/media/midi_dispatcher_host.cc
diff --git a/content/browser/media/midi_dispatcher_host.cc b/content/browser/media/midi_dispatcher_host.cc
index 9b6faa1c585d0808dcee40ab1e987fdaf17c4bbe..a6196dfc9ec4f29263e140c0b0ae879359420871 100644
--- a/content/browser/media/midi_dispatcher_host.cc
+++ b/content/browser/media/midi_dispatcher_host.cc
@@ -64,15 +64,15 @@ void MidiDispatcherHost::OnRequestSysExPermission(
       render_process_id, render_frame_id, bridge_id);
   pending_permissions_.push_back(pending_permission);
 
-  GetContentClient()->browser()->RequestMidiSysExPermission(
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_MIDI_SYSEX,
       web_contents(),
       bridge_id,
       origin,
       user_gesture,
       base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted,
                  weak_factory_.GetWeakPtr(),
-                 render_process_id, render_frame_id, bridge_id),
-      &pending_permissions_.back().cancel);
+                 render_process_id, render_frame_id, bridge_id));
 }
 
 void MidiDispatcherHost::OnCancelSysExPermissionRequest(
@@ -86,8 +86,10 @@ void MidiDispatcherHost::OnCancelSysExPermissionRequest(
     if (pending_permissions_[i].render_process_id == render_process_id &&
         pending_permissions_[i].render_frame_id == render_frame_id &&
         pending_permissions_[i].bridge_id == bridge_id) {
-      if (!pending_permissions_[i].cancel.is_null())
-        pending_permissions_[i].cancel.Run();
+      GetContentClient()->browser()->CancelPermissionRequest(
+                content::PERMISSION_MIDI_SYSEX,
+                web_contents(), bridge_id, requesting_frame);
+
       pending_permissions_.erase(pending_permissions_.begin() + i);
       return;
     }