Introduce the Blink NotificationService, move permission checks there

content/browser/notifications/platform_notification_context_impl.cc

Index: content/browser/notifications/platform_notification_context_impl.cc
diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
index 99c9591c1fbbb000f8fd7413b123dc777fc0743f..93fb537681e46cee030ee3c922fe1f69c2f25d22 100644
--- a/content/browser/notifications/platform_notification_context_impl.cc
+++ b/content/browser/notifications/platform_notification_context_impl.cc
@@ -7,9 +7,12 @@
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "content/browser/notifications/blink_notification_service_impl.h"
 #include "content/browser/notifications/notification_database.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_database_data.h"
@@ -94,11 +97,42 @@ void PlatformNotificationContextImpl::Shutdown() {
 void PlatformNotificationContextImpl::ShutdownOnIO() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
+  STLDeleteElements(&services_);
+
   // |service_worker_context_| may be NULL in tests.
   if (service_worker_context_)
     service_worker_context_->RemoveObserver(this);
 }
 
+void PlatformNotificationContextImpl::CreateService(
+    int render_process_id,
+    mojo::InterfaceRequest<blink::mojom::NotificationService> request) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&PlatformNotificationContextImpl::CreateServiceOnIO, this,

[Michael van Ouwerkerk, 2016/05/06 11:45:20]

Should this use a weak ptr?

[Peter Beverloo, 2016/05/06 14:51:32]

There's no need to keep the object alive for this, so yeah, we can. Done.

+                 render_process_id, browser_context_->GetResourceContext(),
+                 base::Passed(&request)));
+}
+
+void PlatformNotificationContextImpl::CreateServiceOnIO(
+    int render_process_id,
+    ResourceContext* resource_context,
+    mojo::InterfaceRequest<blink::mojom::NotificationService> request) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  services_.insert(new BlinkNotificationServiceImpl(
+      this, resource_context, render_process_id, std::move(request)));
+}
+
+void PlatformNotificationContextImpl::RemoveService(
+    BlinkNotificationServiceImpl* service) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(ContainsValue(services_, service));
+
+  services_.erase(service);
+  delete service;
+}
+
 void PlatformNotificationContextImpl::ReadNotificationData(
     int64_t notification_id,
     const GURL& origin,