[WebsiteSettings] Enable permission bubbles by default.

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..aa29454f2ffb3a7630720bc9ff42b73a3051787f 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,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());
   }
 
   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()) {
+    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());