[WebsiteSettings] Change permission bubble API to adapt to new mocks.

chrome/browser/ui/website_settings/permission_bubble_manager.h

Index: chrome/browser/ui/website_settings/permission_bubble_manager.h
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.h b/chrome/browser/ui/website_settings/permission_bubble_manager.h
index 09850253f9163bf3b72211ed363ef0951c13ba43..d784541bd9e21dbc42832221152cabd20bfabfda 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.h
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.h
@@ -35,15 +35,25 @@ class PermissionBubbleManager
 
   virtual ~PermissionBubbleManager();
 
-  // Add a new request to the permission bubble. Ownership of the request
+  // Adds a new request to the permission bubble. Ownership of the request
   // remains with the caller. The caller must arrange for the request to
   // outlive the PermissionBubbleManager. If a bubble is visible when this
   // call is made, the request will be queued up and shown after the current
-  // bubble closes.
+  // bubble closes. A request with message text identical to an outstanding
+  // request will receive a RequestFinished call immediately and not be added.
   virtual void AddRequest(PermissionBubbleRequest* request);
 
-  // Set the active view for the permission bubble. If this is NULL, it
-  // means the permission bubble is no longer showing.
+  // Cancels an outstanding request. This may have different effects depending
+  // on what is going on with the bubble. If the request is pending, it will be
+  // removed and never shown. If the request is showing, it will continue to be
+  // shown, but the user's action won't be reported back to the request object.
+  // In some circumstances, we can remove the request from the bubble, and may
+  // do so. The caller may delete the request after calling this method.
+  virtual void CancelRequest(PermissionBubbleRequest* request);
+
+  // Sets the active view for the permission bubble. If this is NULL, it
+  // means any existing permission bubble can no longer be shown. Does not
+  // take ownership of the view.
   virtual void SetView(PermissionBubbleView* view) OVERRIDE;
 
  protected: