Use ContentSetting in chrome/ instead of PermissionStatus
This patch updates the PermissionManager so that it's methods exposed to
chrome/ use ContentSetting instead of PermissionStatus. This is to avoid
ContentSetting values being converted to PermissionStatus values and
back again, and makes it clearer which type should be used in chrome/.
The GetPermissionStatus is changed to return a PermissionResult instead
of a PermissionStatus. This will allow us to, for example, surface
denial reasons in website settings.
BUG=689799
TBR=peter,tommycli,xhwang,lfg,devlin,mnissler
Review-Url: https://codereview.chromium.org/2713083003
Cr-Commit-Position: refs/heads/master@{#453855}
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 7615b12..c0222982 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 @@
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(
