Change tests to prepare for turning on the permission bubble flag.

chrome/browser/content_settings/permission_context_base_unittest.cc

Index: chrome/browser/content_settings/permission_context_base_unittest.cc
diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc
index 1877081d05c543f6d0e71dcbdeed2b16a668b618..aecee95e1bc7e48ba4741a126860cf9b843a741d 100644
--- a/chrome/browser/content_settings/permission_context_base_unittest.cc
+++ b/chrome/browser/content_settings/permission_context_base_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -23,11 +24,22 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
   PermissionContextBaseTests() {}
   virtual ~PermissionContextBaseTests() {}
 
+  // Accept or dismiss the permission bubble.
+  void RespondPermissionBubble(bool accept) {
+    PermissionBubbleManager* manager =
+        PermissionBubbleManager::FromWebContents(web_contents());
+    if (accept)
+      manager->Accept();
+    else
+      manager->Closing();
+  }
+
  private:
   // ChromeRenderViewHostTestHarness:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     InfoBarService::CreateForWebContents(web_contents());
+    PermissionBubbleManager::CreateForWebContents(web_contents());

[leng, 2014/07/23 16:29:10]

Is this a no-op for !PermissionBubbleManager::Enabled()?

[Greg Billock, 2014/07/29 16:44:13]

Not quite a no-op, but shouldn't interfere.

   }
 
   DISALLOW_COPY_AND_ASSIGN(PermissionContextBaseTests);
@@ -96,8 +108,12 @@ TEST_F(PermissionContextBaseTests, TestAskAndGrant) {
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
-  permission_context.GetInfoBarController()->OnPermissionSet(
-      id, url, url, true, true);
+  if (!PermissionBubbleManager::Enabled()) {

[Miguel Garcia, 2014/07/25 12:17:35]

Can you create a Respond(bool value)  method that does infobars or bubbles and
then just use it in both tests in stead of having one if per test?

[Greg Billock, 2014/07/29 16:44:13]

Done.

+    permission_context.GetInfoBarController()->OnPermissionSet(
+        id, url, url, true, true);
+  } else {
+    RespondPermissionBubble(true);
+  }
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_TRUE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());
@@ -127,8 +143,12 @@ TEST_F(PermissionContextBaseTests, TestAskAndDismiss) {
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
-  permission_context.GetInfoBarController()->OnPermissionSet(
-      id, url, url, false, false);
+  if (!PermissionBubbleManager::Enabled()) {
+    permission_context.GetInfoBarController()->OnPermissionSet(
+        id, url, url, false, false);
+  } else {
+    RespondPermissionBubble(false);
+  }
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_FALSE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());