Introduce the Blink NotificationService, move permission checks there

content/browser/notifications/platform_notification_context_impl.cc

 // Copyright 2015 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/browser/notifications/platform_notification_context_impl.h"
 
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
+#include "base/memory/ptr_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"
 #include "content/public/browser/platform_notification_service.h"
 
 using base::DoNothing;
 
 namespace content {
 
 // Name of the directory in the user's profile directory where the notification
 // database files should be stored.
 const base::FilePath::CharType kPlatformNotificationsDirectory[] =
     FILE_PATH_LITERAL("Platform Notifications");
 
 PlatformNotificationContextImpl::PlatformNotificationContextImpl(
     const base::FilePath& path,
     BrowserContext* browser_context,
     const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context)
     : path_(path),
       browser_context_(browser_context),
-      service_worker_context_(service_worker_context) {
+      service_worker_context_(service_worker_context),
+      weak_factory_to_io_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 PlatformNotificationContextImpl::~PlatformNotificationContextImpl() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If the database has been initialized, it must be deleted on the task runner
   // thread as closing it may cause file I/O.
   if (database_) {
     DCHECK(task_runner_);
@@ skipping 43 matching lines @@
 void PlatformNotificationContextImpl::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PlatformNotificationContextImpl::ShutdownOnIO, this));
 }
 
 void PlatformNotificationContextImpl::ShutdownOnIO() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
+  services_.clear();
+
   // |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,
+                 weak_factory_to_io_.GetWeakPtr(), render_process_id,

[yzshen1, 2016/05/18 15:28:56]

Not sure whether it is relevant to the hang that you saw...but this seems wrong:
the weak pointer is dereferenced on IO thread, but the factory is destroyed on
the UI thread. That could be racy. Please see the thread safty notes in
weak_ptr.h 

+                 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_.push_back(base::WrapUnique(new BlinkNotificationServiceImpl(
+      this, resource_context, render_process_id, std::move(request))));
+}
+
+void PlatformNotificationContextImpl::RemoveService(
+    BlinkNotificationServiceImpl* service) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  auto services_to_remove = std::remove_if(
+      services_.begin(), services_.end(),
+      [service](const std::unique_ptr<BlinkNotificationServiceImpl>& ptr) {
+        return ptr.get() == service;
+      });
+
+  services_.erase(services_to_remove, services_.end());
+}
+
 void PlatformNotificationContextImpl::ReadNotificationData(
     int64_t notification_id,
     const GURL& origin,
     const ReadResultCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   LazyInitialize(
       base::Bind(&PlatformNotificationContextImpl::DoReadNotificationData, this,
                  notification_id, origin, callback),
       base::Bind(callback, false /* success */, NotificationDatabaseData()));
 }
@@ skipping 290 matching lines @@
 
   return path_.Append(kPlatformNotificationsDirectory);
 }
 
 void PlatformNotificationContextImpl::SetTaskRunnerForTesting(
     const scoped_refptr<base::SequencedTaskRunner>& task_runner) {
   task_runner_ = task_runner;
 }
 
 }  // namespace content