Index: chrome/browser/notifications/platform_notification_service_browsertest.cc |
diff --git a/chrome/browser/notifications/platform_notification_service_browsertest.cc b/chrome/browser/notifications/platform_notification_service_browsertest.cc |
index 07c9e984e6dfa1bd2e870a970074d9e8a29cb016..a95b4592171756962152b1be5815b841117f6f42 100644 |
--- a/chrome/browser/notifications/platform_notification_service_browsertest.cc |
+++ b/chrome/browser/notifications/platform_notification_service_browsertest.cc |
@@ -13,10 +13,11 @@ |
#include "base/time/time.h" |
#include "chrome/browser/notifications/desktop_notification_profile_util.h" |
#include "chrome/browser/notifications/notification.h" |
-#include "chrome/browser/notifications/notification_permission_context.h" |
-#include "chrome/browser/notifications/notification_permission_context_factory.h" |
#include "chrome/browser/notifications/notification_test_util.h" |
#include "chrome/browser/notifications/platform_notification_service_impl.h" |
+#include "chrome/browser/permissions/permission_context_base.h" |
+#include "chrome/browser/permissions/permission_manager.h" |
+#include "chrome/browser/permissions/permission_manager_factory.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
@@ -400,18 +401,16 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest, |
// This case should succeed because a normal page URL is used. |
std::string script_result; |
- NotificationPermissionContext* permission_context = |
- NotificationPermissionContextFactory::GetForProfile(browser()->profile()); |
- ASSERT_TRUE(permission_context); |
+ PermissionContextBase* permission_context = |
+ PermissionManagerFactory::GetForProfile(browser()->profile()) |
+ ->GetPermissionContext(content::PermissionType::NOTIFICATIONS); |
- EXPECT_EQ(CONTENT_SETTING_ASK, |
- permission_context->GetPermissionStatus(TestPageUrl(), |
- TestPageUrl())); |
+ EXPECT_EQ(CONTENT_SETTING_ASK, permission_context->GetPermissionStatus( |
+ TestPageUrl(), TestPageUrl())); |
RequestAndAcceptPermission(); |
- EXPECT_EQ(CONTENT_SETTING_ALLOW, |
- permission_context->GetPermissionStatus(TestPageUrl(), |
- TestPageUrl())); |
+ EXPECT_EQ(CONTENT_SETTING_ALLOW, permission_context->GetPermissionStatus( |
+ TestPageUrl(), TestPageUrl())); |
// This case should fail because a file URL is used. |
base::FilePath dir_source_root; |