[Media,Geolocation] Add permission bubble cancellation.

chrome/browser/media/chrome_midi_permission_context.h

Index: chrome/browser/media/chrome_midi_permission_context.h
diff --git a/chrome/browser/media/chrome_midi_permission_context.h b/chrome/browser/media/chrome_midi_permission_context.h
index f292e7bd9776a73f229442ec38f5de957add66cb..b3c6b848c35ca8eda13ab9c718a9144d335175af 100644
--- a/chrome/browser/media/chrome_midi_permission_context.h
+++ b/chrome/browser/media/chrome_midi_permission_context.h
@@ -14,6 +14,7 @@ class WebContents;
 }
 
 class GURL;
+class MidiPermissionRequest;
 class PermissionQueueController;
 class PermissionRequestID;
 class Profile;
@@ -52,6 +53,8 @@ class ChromeMidiPermissionContext : public KeyedService {
       bool allowed);
 
  private:
+  friend class MidiPermissionRequest;
+
   // Decide whether the permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an infobar.
@@ -77,10 +80,15 @@ class ChromeMidiPermissionContext : public KeyedService {
   // Removes any pending InfoBar request.
   void CancelPendingInfobarRequest(const PermissionRequestID& id);
 
+  // Notify the context that a particular request object is no longer needed.
+  void RequestFinished(MidiPermissionRequest* request);
+
   Profile* const profile_;
   bool shutting_down_;
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
 
+  std::map<std::string, MidiPermissionRequest*> pending_requests_;

[Ami GONE FROM CHROMIUM, 2014/05/21 20:15:13]

I think you missed the comments I made on this file in PS#4.

+
   DISALLOW_COPY_AND_ASSIGN(ChromeMidiPermissionContext);
 };