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 22ce437a905dbc93ef65417a5a624c4ee39fada5..5f22c0822af345d4932507a3ae0ae0ff2c33dff1 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/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
@@ -23,11 +24,29 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
   PermissionContextBaseTests() {}
   virtual ~PermissionContextBaseTests() {}
 
+  // Accept or dismiss the permission bubble or infobar.
+  void RespondToPermission(const PermissionRequestID& id,
+                           const GURL& url,
+                           bool accept) {
+    if (!PermissionBubbleManager::Enabled()) {
+      permission_context.GetInfoBarController()->OnPermissionSet(
+          id, url, url, accept, accept);

[Bernhard Bauer, 2014/08/13 21:30:31]

You could return here to remove a level of indentation below.

[Greg Billock, 2014/08/13 22:12:23]

Done.

+    } else {
+      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());
   }
 
   DISALLOW_COPY_AND_ASSIGN(PermissionContextBaseTests);
@@ -96,8 +115,7 @@ TEST_F(PermissionContextBaseTests, TestAskAndGrant) {
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
-  permission_context.GetInfoBarController()->OnPermissionSet(
-      id, url, url, true, true);
+  RespondToPermission(id, url, true);
   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_TRUE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());
@@ -127,8 +145,7 @@ TEST_F(PermissionContextBaseTests, TestAskAndDismiss) {
       base::Bind(&TestPermissionContext::TrackPermissionDecision,
                  base::Unretained(&permission_context)));
 
-  permission_context.GetInfoBarController()->OnPermissionSet(
-      id, url, url, false, false);
+  RespondToPermission(false);

[Bernhard Bauer, 2014/08/13 21:30:31]

Missing parameters?

[Greg Billock, 2014/08/13 22:12:23]

yeah, I thought I compiled this, but obviously not -- I'm trying to peel CLs off
a working set of code that addressed many tests...

   EXPECT_TRUE(permission_context.permission_set());
   EXPECT_FALSE(permission_context.permission_granted());
   EXPECT_TRUE(permission_context.tab_context_updated());