Group the different permission related methods in the content api.

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 4d7ebff1e8ba6884f4f9a1299745c4d3b436142b..981783b66b998d6b6997ee647590c0b372e0aae8 100644
--- a/content/browser/media/midi_dispatcher_host.cc
+++ b/content/browser/media/midi_dispatcher_host.cc
@@ -78,15 +78,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::CancelPermissionRequestsForFrame(
@@ -97,8 +97,11 @@ void MidiDispatcherHost::CancelPermissionRequestsForFrame(
   for (size_t i = 0; i < pending_permissions_.size(); ++i) {
     if (pending_permissions_[i].render_process_id == render_process_id &&
         pending_permissions_[i].render_frame_id == render_frame_id) {
-      if (!pending_permissions_[i].cancel.is_null())
-        pending_permissions_[i].cancel.Run();
+      GetContentClient()->browser()->CancelPermissionRequest(
+          content::PERMISSION_MIDI_SYSEX,

[jam, 2014/10/20 20:13:57]

nit: here and above, and elsewhere, no "content::"

[Miguel Garcia, 2014/10/21 17:17:12]

Done.

+          web_contents(), pending_permissions_[i].bridge_id,
+          render_frame_host->GetLastCommittedURL());
+
       pending_permissions_.erase(pending_permissions_.begin() + i);
       return;
     }