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

chrome/browser/ui/website_settings/permission_bubble_manager.cc

 // 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.
 
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/user_metrics_action.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ skipping 39 matching lines @@
   base::string16 message_text_;
   base::string16 message_fragment_;
   bool user_gesture_;
   GURL hostname_;
 };
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PermissionBubbleManager);
 
+// PermissionBubbleManager::Observer -------------------------------------------
+PermissionBubbleManager::Observer::~Observer() {
+}
+
+void PermissionBubbleManager::Observer::OnBubbleAdded() {
+}
+
+// PermissionBubbleManager -----------------------------------------------------
+
 // static
 bool PermissionBubbleManager::Enabled() {
   // Command line flags take precedence.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePermissionsBubbles))
     return true;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePermissionsBubbles))
     return false;
 
@@ skipping 269 matching lines @@
     // TODO(leng):  Currently all requests default to true.  If that changes:
     // a) Add additional accept_state queues to store default values.
     // b) Change the request API to provide the default value.
     accept_states_.resize(requests_.size(), true);
   }
 
   // Note: this should appear above Show() for testing, since in that
   // case we may do in-line calling of finalization.
   bubble_showing_ = true;
   view_->Show(requests_, accept_states_);
+  NotifyBubbleAdded(view_);

[msw, 2015/06/04 01:22:08]

Instead of adding the observer and responder classes, etc., just add a
PermissionBubbleManager::set_auto_response_type_for_test(AutoResponseType
response), then this code can Accept/Deny/Dismiss inline according to
auto_response_type_for_test_, and the tests can just do
GetPermissionBubbleManager()->set_auto_response_type_for_test(ACCEPT/DENY/DISMISS/NONE)
as needed.

[felt, 2015/06/05 00:38:21]

There is one disadvantage of the set_auto_response_type_for_test approach: now
every new browser test will need to be friend classed, which is a bit ungainly
and encourages calling more private methods in tests. However, you are right
that it is much simpler.

I added the set_auto_response_type_for_test approach as a new patchset, please
take a look.

 }
 
 void PermissionBubbleManager::FinalizeBubble() {
   if (view_)
     view_->Hide();
   bubble_showing_ = false;
 
   std::vector<PermissionBubbleRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
        requests_iter != requests_.end();
@@ skipping 48 matching lines @@
 bool PermissionBubbleManager::HasUserGestureRequest(
     const std::vector<PermissionBubbleRequest*>& queue) {
   std::vector<PermissionBubbleRequest*>::const_iterator iter;
   for (iter = queue.begin(); iter != queue.end(); iter++) {
     if ((*iter)->HasUserGesture())
       return true;
   }
   return false;
 }
 
+void PermissionBubbleManager::AddObserver(Observer* obs) {
+  observer_list_.AddObserver(obs);
+}
+
+void PermissionBubbleManager::RemoveObserver(Observer* obs) {
+  observer_list_.RemoveObserver(obs);
+}
+
+void PermissionBubbleManager::NotifyBubbleAdded(PermissionBubbleView* bubble) {
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnBubbleAdded());
+}