| Index: chrome/browser/notifications/message_center_settings_controller_unittest.cc
|
| diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
|
| index d33945abcc6bf933a6571c2153f5b74eb2f606b1..5f663a0982bc47d6592441d32429626784de3435 100644
|
| --- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
|
| +++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
|
| @@ -18,7 +18,7 @@
|
| #include "chrome/test/base/testing_browser_process.h"
|
| #include "chrome/test/base/testing_profile_manager.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| -#include "content/public/browser/permission_type.h"
|
| +#include "components/content_settings/core/common/content_settings_types.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extension_builder.h"
|
| @@ -317,13 +317,13 @@ TEST_F(MessageCenterSettingsControllerTest, SetWebPageNotifierEnabled) {
|
| controller()->SetNotifierEnabled(disabled_notifier, true);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
|
|
| // (2) Disable the permission when the default is to ask (expected to clear).
|
| controller()->SetNotifierEnabled(enabled_notifier, false);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
|
|
| // Change the default content setting vaule for notifications to ALLOW.
|
| HostContentSettingsMapFactory::GetForProfile(profile)
|
| @@ -334,13 +334,13 @@ TEST_F(MessageCenterSettingsControllerTest, SetWebPageNotifierEnabled) {
|
| controller()->SetNotifierEnabled(enabled_notifier, false);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::DENIED,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
|
|
| // (4) Enable the permission when the default is allowed (expected to clear).
|
| controller()->SetNotifierEnabled(disabled_notifier, true);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
|
|
| // Now change the default content setting value to BLOCK.
|
| HostContentSettingsMapFactory::GetForProfile(profile)
|
| @@ -351,11 +351,11 @@ TEST_F(MessageCenterSettingsControllerTest, SetWebPageNotifierEnabled) {
|
| controller()->SetNotifierEnabled(disabled_notifier, true);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
|
|
| // (6) Disable the permission when the default is blocked (expected to clear).
|
| controller()->SetNotifierEnabled(enabled_notifier, false);
|
| EXPECT_EQ(blink::mojom::PermissionStatus::DENIED,
|
| permission_manager->GetPermissionStatus(
|
| - content::PermissionType::NOTIFICATIONS, origin, origin));
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
| }
|
|
|