| Index: chrome/browser/notifications/notification_permission_context_unittest.cc
|
| diff --git a/chrome/browser/notifications/notification_permission_context_unittest.cc b/chrome/browser/notifications/notification_permission_context_unittest.cc
|
| index f61a25f8476319221df80d5a992fe3508db5e7b7..21dec7f2ac356ce1831ef7a7a16e28acfdc5a4cc 100644
|
| --- a/chrome/browser/notifications/notification_permission_context_unittest.cc
|
| +++ b/chrome/browser/notifications/notification_permission_context_unittest.cc
|
| @@ -117,21 +117,29 @@ TEST_F(NotificationPermissionContextTest, IgnoresEmbedderOrigin) {
|
| CONTENT_SETTING_ALLOW);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| - context.GetPermissionStatus(requesting_origin, embedding_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + requesting_origin, embedding_origin)
|
| .content_setting);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| - context.GetPermissionStatus(requesting_origin, different_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + requesting_origin, different_origin)
|
| .content_setting);
|
|
|
| context.ResetPermission(requesting_origin, embedding_origin);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ASK,
|
| - context.GetPermissionStatus(requesting_origin, embedding_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + requesting_origin, embedding_origin)
|
| .content_setting);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ASK,
|
| - context.GetPermissionStatus(requesting_origin, different_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + requesting_origin, different_origin)
|
| .content_setting);
|
| }
|
|
|
| @@ -147,7 +155,9 @@ TEST_F(NotificationPermissionContextTest, PushTopLevelOriginOnly) {
|
| CONTENT_SETTING_ALLOW);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| - context.GetPermissionStatus(requesting_origin, embedding_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + requesting_origin, embedding_origin)
|
| .content_setting);
|
|
|
| context.ResetPermission(requesting_origin, embedding_origin);
|
| @@ -156,13 +166,17 @@ TEST_F(NotificationPermissionContextTest, PushTopLevelOriginOnly) {
|
| CONTENT_SETTING_ALLOW);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| - context.GetPermissionStatus(embedding_origin, embedding_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + embedding_origin, embedding_origin)
|
| .content_setting);
|
|
|
| context.ResetPermission(embedding_origin, embedding_origin);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ASK,
|
| - context.GetPermissionStatus(embedding_origin, embedding_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + embedding_origin, embedding_origin)
|
| .content_setting);
|
| }
|
|
|
| @@ -173,13 +187,19 @@ TEST_F(NotificationPermissionContextTest, NoSecureOriginRequirement) {
|
|
|
| NotificationPermissionContext context(profile(),
|
| CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
|
| - EXPECT_EQ(CONTENT_SETTING_ASK,
|
| - context.GetPermissionStatus(origin, origin).content_setting);
|
| + EXPECT_EQ(
|
| + CONTENT_SETTING_ASK,
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */, origin, origin)
|
| + .content_setting);
|
|
|
| UpdateContentSetting(&context, origin, origin, CONTENT_SETTING_ALLOW);
|
|
|
| - EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| - context.GetPermissionStatus(origin, origin).content_setting);
|
| + EXPECT_EQ(
|
| + CONTENT_SETTING_ALLOW,
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */, origin, origin)
|
| + .content_setting);
|
| }
|
|
|
| // Push notifications requires a secure origin to acquire permission.
|
| @@ -189,23 +209,33 @@ TEST_F(NotificationPermissionContextTest, PushSecureOriginRequirement) {
|
|
|
| NotificationPermissionContext context(
|
| profile(), CONTENT_SETTINGS_TYPE_PUSH_MESSAGING);
|
| - EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| - context.GetPermissionStatus(origin, origin).content_setting);
|
| + EXPECT_EQ(
|
| + CONTENT_SETTING_BLOCK,
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */, origin, origin)
|
| + .content_setting);
|
|
|
| UpdateContentSetting(&context, origin, origin, CONTENT_SETTING_ALLOW);
|
|
|
| - EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| - context.GetPermissionStatus(origin, origin).content_setting);
|
| + EXPECT_EQ(
|
| + CONTENT_SETTING_BLOCK,
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */, origin, origin)
|
| + .content_setting);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ASK,
|
| - context.GetPermissionStatus(secure_origin, secure_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + secure_origin, secure_origin)
|
| .content_setting);
|
|
|
| UpdateContentSetting(&context, secure_origin, secure_origin,
|
| CONTENT_SETTING_ALLOW);
|
|
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| - context.GetPermissionStatus(secure_origin, secure_origin)
|
| + context
|
| + .GetPermissionStatus(nullptr /* render_frame_host */,
|
| + secure_origin, secure_origin)
|
| .content_setting);
|
| }
|
|
|
|
|