Permissions: Move common logic from DecidePermission to RequestPermission

chrome/browser/push_messaging/push_messaging_permission_context_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/push_messaging/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const char kOriginA[] = "https://origina.org";
 const char kOriginB[] = "https://originb.org";
 const char kInsecureOrigin[] = "http://insecureorigin.org";
 
 class TestPushMessagingPermissionContext
     : public PushMessagingPermissionContext {
  public:
   explicit TestPushMessagingPermissionContext(Profile* profile)
@@ skipping 13 matching lines @@
                            bool persist,
                            ContentSetting content_setting) override {
     was_persisted_ = persist;
     permission_granted_ = content_setting == CONTENT_SETTING_ALLOW;
   }
 
   bool was_persisted_;
   bool permission_granted_;
 };
 
-class PushMessagingPermissionContextTest : public testing::Test {
+class PushMessagingPermissionContextTest
+    : public ChromeRenderViewHostTestHarness {
  public:
   PushMessagingPermissionContextTest() {}
 
  protected:
   void SetContentSetting(Profile* profile,
                          ContentSettingsType setting,
                          ContentSetting value) {
     ContentSettingsPattern pattern_a =
         ContentSettingsPattern::FromString(kOriginA);
     ContentSettingsPattern insecure_pattern =
         ContentSettingsPattern::FromString(kInsecureOrigin);
     HostContentSettingsMap* host_content_settings_map =
         HostContentSettingsMapFactory::GetForProfile(profile);
     host_content_settings_map->SetContentSetting(pattern_a, pattern_a, setting,
                                                  std::string(), value);
     host_content_settings_map->SetContentSetting(
         insecure_pattern, insecure_pattern, setting, std::string(), value);
   }
-
-  content::TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(PushMessagingPermissionContextTest, HasPermissionPrompt) {
   TestingProfile profile;
   PushMessagingPermissionContext context(&profile);
   EXPECT_EQ(CONTENT_SETTING_ASK,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
 
   // Just granting notifications should still prompt
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
@@ skipping 96 matching lines @@
   PermissionRequestID request_id(-1, -1, -1);
   BrowserPermissionCallback callback;
 
   // Requesting and embedding origin are different.
   context.DecidePermission(NULL, request_id, GURL(kOriginA), GURL(kOriginB),
                            true, callback);
   EXPECT_FALSE(context.was_persisted());
   EXPECT_FALSE(context.was_granted());
 
   // Insecure origin
-  context.DecidePermission(NULL, request_id, GURL(kInsecureOrigin),
-                           GURL(kInsecureOrigin), true, callback);
+  SetContents(CreateTestWebContents());
+  NavigateAndCommit(GURL(kInsecureOrigin));
+  context.RequestPermission(web_contents(), request_id, GURL(kInsecureOrigin),
+                          true, callback);
   EXPECT_FALSE(context.was_persisted());
   EXPECT_FALSE(context.was_granted());
 }
 
 TEST_F(PushMessagingPermissionContextTest, GetPermissionStatusInsecureOrigin) {
   TestingProfile profile;
   TestPushMessagingPermissionContext context(&profile);
 
   // The status should be blocked for an insecure origin, regardless of the
   // content setting value.
@@ skipping 14 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
                     CONTENT_SETTING_ASK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 }