Revert of [WebsiteSettings] Update permission bubble manager policy

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"
 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 class PermissionBubbleRequest;
 
 // Provides access to permissions bubbles. Allows clients to add a request
 // callback interface to the existing permission bubble configuration.
 // Depending on the situation and policy, that may add new UI to an existing
 // permission bubble, create and show a new permission bubble, or provide no
@@ skipping 28 matching lines @@
   // 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>;
 
   explicit PermissionBubbleManager(content::WebContents* web_contents);
 
-  // WebContentsObserver:
-
-  // TODO(leng): Finalize policy for permission requests with iFrames.
-  // DocumentLoadedInFrame() might be needed as well.
-  virtual void DocumentOnLoadCompletedInMainFrame(int32 page_id) OVERRIDE;
-
+  // contents::WebContentsObserver:
+  // TODO(leng):  Investigate the ordering and timing of page loading and
+  // permission requests with iFrames. DocumentOnLoadCompletedInMainFrame()
+  // and DocumentLoadedInFrame() might be needed as well.
+  virtual void DidFinishLoad(
+      int64 frame_id,
+      const GURL& validated_url,
+      bool is_main_frame,
+      content::RenderViewHost* render_view_host) OVERRIDE;
   // If a page on which permissions requests are pending is navigated,
   // they will be finalized as if canceled by the user.
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& details) OVERRIDE;
   virtual void WebContentsDestroyed(
       content::WebContents* web_contents) OVERRIDE;
 
   // PermissionBubbleView::Delegate:
   virtual void ToggleAccept(int request_index, bool new_value) OVERRIDE;
   virtual void SetCustomizationMode() OVERRIDE;
   virtual void Accept() OVERRIDE;
   virtual void Deny() OVERRIDE;
   virtual void Closing() OVERRIDE;
 
+  // Called when the coalescing timer is done. Presents the bubble.
   void ShowBubble();
 
   // Finalize the pending permissions request.
   void FinalizeBubble();
 
   // Cancel any pending requests. This is called if the WebContents
   // on which permissions calls are pending is destroyed or navigated away
   // from the requesting page.
   void CancelPendingQueue();
 
   // Whether or not we are showing the bubble in this tab.
   bool bubble_showing_;
 
   // Set to the UI surface to be used to display the permissions requests.
   PermissionBubbleView* view_;
 
   std::vector<PermissionBubbleRequest*> requests_;
   std::vector<PermissionBubbleRequest*> queued_requests_;
   GURL request_url_;
-  bool request_url_has_loaded_;
   std::vector<bool> accept_states_;
   bool customization_mode_;
+
+  scoped_ptr<base::Timer> timer_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_