| Index: chrome/browser/extensions/service_worker_apitest.cc
|
| diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
|
| index 7615b12529c40d16c62fe1ebac29ef398dc99b8a..c0222982ef5c4d20af22c65226e0f3591c1efb30 100644
|
| --- a/chrome/browser/extensions/service_worker_apitest.cc
|
| +++ b/chrome/browser/extensions/service_worker_apitest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/gcm/gcm_profile_service_factory.h"
|
| #include "chrome/browser/notifications/desktop_notification_profile_util.h"
|
| #include "chrome/browser/permissions/permission_manager.h"
|
| +#include "chrome/browser/permissions/permission_result.h"
|
| #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
|
| #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
|
| #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
|
| @@ -223,9 +224,11 @@ class ServiceWorkerPushMessagingTest : public ServiceWorkerTest {
|
| void GrantNotificationPermissionForTest(const GURL& url) {
|
| GURL origin = url.GetOrigin();
|
| DesktopNotificationProfileUtil::GrantPermission(profile(), origin);
|
| - ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
|
| - PermissionManager::Get(profile())->GetPermissionStatus(
|
| - CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
|
| + ASSERT_EQ(CONTENT_SETTING_ALLOW,
|
| + PermissionManager::Get(profile())
|
| + ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
|
| + origin, origin)
|
| + .content_setting);
|
| }
|
|
|
| PushMessagingAppIdentifier GetAppIdentifierForServiceWorkerRegistration(
|
|
|