Migrate notifications to use the PermissionStatus enum

content/child/notifications/notification_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/notifications/notification_manager.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "content/child/notifications/notification_data_conversions.h"
 #include "content/child/notifications/notification_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/notification_constants.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
 
-using blink::WebNotificationPermission;
-
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
 
 NotificationResources ToNotificationResources(
     std::unique_ptr<blink::WebNotificationResources> web_resources) {
   NotificationResources resources;
@@ skipping 169 matching lines @@
     blink::WebNotificationDelegate* delegate) {
   for (auto& iter : active_page_notifications_) {
     if (iter.second != delegate)
       continue;
 
     active_page_notifications_.erase(iter.first);
     return;
   }
 }
 
-WebNotificationPermission NotificationManager::checkPermission(
+blink::mojom::PermissionStatus NotificationManager::checkPermission(
     const blink::WebSecurityOrigin& origin) {
-  WebNotificationPermission permission =
-      blink::WebNotificationPermissionAllowed;
+  blink::mojom::PermissionStatus permission_status =
+      blink::mojom::PermissionStatus::DENIED;

[Peter Beverloo, 2016/04/19 14:54:02]

This shouldn't make any difference since the sync IPC below will override it,
but defaulting to DENIED seems sensible.

+
   // TODO(mkwst): This is potentially doing the wrong thing with unique
   // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See
   // https://crbug.com/490074 for detail.
   thread_safe_sender_->Send(new PlatformNotificationHostMsg_CheckPermission(
-      blink::WebStringToGURL(origin.toString()), &permission));
+      blink::WebStringToGURL(origin.toString()), &permission_status));
 
-  return permission;
+  return permission_status;
 }
 
 size_t NotificationManager::maxActions() {
   return kPlatformNotificationMaxActions;
 }
 
 bool NotificationManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NotificationManager, message)
     IPC_MESSAGE_HANDLER(PlatformNotificationMsg_DidShow, OnDidShow);
@@ skipping 70 matching lines @@
 
     notifications[i] = web_notification_info;
   }
 
   callbacks->onSuccess(notifications);
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 }  // namespace content