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

chrome/browser/ui/website_settings/permission_bubble_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_
 
 #include <vector>
 
 #include "base/timer/timer.h"
@@ skipping 17 matching lines @@
 class PermissionBubbleManager
     : public content::WebContentsObserver,
       public content::WebContentsUserData<PermissionBubbleManager>,
       public PermissionBubbleView::Delegate {
  public:
   // Return the flag-driven enabled state of permissions bubbles.
   static bool Enabled();
 
   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:
   // Sets the coalesce time interval to |interval_ms|. For testing only.
   void SetCoalesceIntervalForTesting(int interval_ms);
 
  private:
   friend class PermissionBubbleManagerTest;
   friend class DownloadRequestLimiterTest;
   friend class content::WebContentsUserData<PermissionBubbleManager>;
@@ skipping 33 matching lines @@
 
   std::vector<PermissionBubbleRequest*> requests_;
   std::vector<PermissionBubbleRequest*> queued_requests_;
   std::vector<bool> accept_states_;
   bool customization_mode_;
 
   scoped_ptr<base::Timer> timer_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_