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

chrome/browser/content_settings/permission_context_base_unittest.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/content_settings/permission_context_base.h"
 
 #include "base/bind.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #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"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
  protected:
   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);
 };
 
 class TestPermissionContext : public PermissionContextBase {
  public:
   TestPermissionContext(Profile* profile,
                   const ContentSettingsType permission_type)
    : PermissionContextBase(profile, permission_type),
@@ skipping 48 matching lines @@
   const PermissionRequestID id(
       web_contents()->GetRenderProcessHost()->GetID(),
       web_contents()->GetRenderViewHost()->GetRoutingID(),
       -1, GURL());
   permission_context.RequestPermission(
       web_contents(),
       id, url, true,
       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());
 
   ContentSetting setting =
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           url.GetOrigin(), url.GetOrigin(),
           CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, std::string());
   EXPECT_EQ(CONTENT_SETTING_ALLOW , setting);
 };
 
 // Simulates clicking Dismiss (X in the infobar.
 // The permission should be denied but not saved for future use.
 TEST_F(PermissionContextBaseTests, TestAskAndDismiss) {
   TestPermissionContext permission_context(profile(),
                       CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
   GURL url("http://www.google.es");
   content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
   const PermissionRequestID id(
       web_contents()->GetRenderProcessHost()->GetID(),
       web_contents()->GetRenderViewHost()->GetRoutingID(),
       -1, GURL());
   permission_context.RequestPermission(
       web_contents(),
       id, url, true,
       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());
 
   ContentSetting setting =
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           url.GetOrigin(), url.GetOrigin(),
           CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string());
   EXPECT_EQ(CONTENT_SETTING_ASK , setting);
 };