Update push messaging tests to use both infobars and bubbles (w/ autoresponse)

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/memory/weak_ptr.h"
+#include "base/observer_list.h"

[msw, 2015/06/05 01:52:00]

Remove this

[felt, 2015/06/05 06:37:29]

Done.

 #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
 // visible UI action at all. (In that case, the request will be immediately
 // informed that the permission request failed.)
 //
 // A PermissionBubbleManager is associated with a particular WebContents.
 // Requests attached to a particular WebContents' PBM must outlive it.
 //
 // The PermissionBubbleManager should be addressed on the UI thread.
 class PermissionBubbleManager
     : public content::WebContentsObserver,
       public content::WebContentsUserData<PermissionBubbleManager>,
       public PermissionBubbleView::Delegate {
  public:
+  class Observer {

[msw, 2015/06/05 01:52:00]

Remove this.

[felt, 2015/06/05 06:37:29]

Done.

+   public:
+    virtual ~Observer();
+    virtual void OnBubbleAdded();
+  };
+
   // Return the enabled state of permissions bubbles.
   // Controlled by a flag and FieldTrial.
   static bool Enabled();
 
   ~PermissionBubbleManager() override;
 
   // 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
@@ skipping 22 matching lines @@
   void RequireUserGesture(bool required);
 
  private:
   friend class DownloadRequestLimiterTest;
   friend class GeolocationBrowserTest;
   friend class GeolocationPermissionContextTests;
   friend class GeolocationPermissionContextParamTests;
   friend class PermissionBubbleManagerTest;
   friend class PermissionContextBaseTests;
   friend class content::WebContentsUserData<PermissionBubbleManager>;
+  friend class PushMessagingBrowserTest;

[msw, 2015/06/05 01:52:00]

Avoid friending by making the test setter public.

[felt, 2015/06/05 06:37:29]

This makes me a little anxious... but I guess my comment ought to serve as an
adequate deterrent.

+
+  enum AutoResponseType {
+    NOT_TESTING,

[msw, 2015/06/05 01:52:00]

nit: maybe rename |NONE| (tests might want to clear the auto response too)

[felt, 2015/06/05 06:37:29]

Done.

+    ACCEPT_ALL,
+    DENY_ALL,
+    DISMISS
+  };
 
   explicit PermissionBubbleManager(content::WebContents* web_contents);
 
   // WebContentsObserver:
   void DocumentOnLoadCompletedInMainFrame() override;
   void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
 
   // If a page on which permissions requests are pending is navigated,
   // they will be finalized as if canceled by the user.
@@ skipping 27 matching lines @@
   // is the same object as an existing request in |queue|, false otherwise.
   bool ExistingRequest(PermissionBubbleRequest* request,
                        const std::vector<PermissionBubbleRequest*>& queue,
                        bool* same_object);
 
   // Returns true if |queue| contains a request which was generated by a user
   // gesture.  Returns false otherwise.
   bool HasUserGestureRequest(
       const std::vector<PermissionBubbleRequest*>& queue);
 
+  // Do NOT use these methods in production code. Use these methods in browser
+  // tests that need to accept or deny permissions when requested in
+  // JavaScript. Your test needs to set set_auto_response_for_testing_only_
+  // and then the bubble will proceed as desired as soon as Show() is called.
+  void set_auto_response_for_testing_only_(AutoResponseType response);

[msw, 2015/06/05 01:52:00]

Name this |set_auto_response_for_test|.

[felt, 2015/06/05 06:37:29]

Done.

+  void DoAutoResponseForTesting();
+
   // Whether to delay displaying the bubble until a request with a user gesture.
   // False by default, unless RequireUserGesture(bool) changes the value.
   bool require_user_gesture_;
 
   // 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_;
   std::vector<PermissionBubbleRequest*> queued_frame_requests_;
 
   // URL of the main frame in the WebContents to which this manager is attached.
   // TODO(gbillock): if there are iframes in the page, we need to deal with it.
   GURL request_url_;
   bool request_url_has_loaded_;
 
   std::vector<bool> accept_states_;
 
+  AutoResponseType auto_response_for_testing_only_;

[msw, 2015/06/05 01:52:00]

Name this |auto_response_for_test_|

[felt, 2015/06/05 06:37:29]

Done.

+
   base::WeakPtrFactory<PermissionBubbleManager> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_