[WebAPKs] Plumb service worker scope to notifications

content/browser/notifications/notification_message_filter.cc

Index: content/browser/notifications/notification_message_filter.cc
diff --git a/content/browser/notifications/notification_message_filter.cc b/content/browser/notifications/notification_message_filter.cc
index d522e75f7d54a3c98f5fc561aad7f0828ab5368a..8d0fbee4444bf69ccf26286b9ed611bdd75380d3 100644
--- a/content/browser/notifications/notification_message_filter.cc
+++ b/content/browser/notifications/notification_message_filter.cc
@@ -10,6 +10,7 @@
 #include "content/browser/bad_message.h"
 #include "content/browser/notifications/page_notification_delegate.h"
 #include "content/browser/notifications/platform_notification_context_impl.h"
+#include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/common/platform_notification_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -18,6 +19,7 @@
 #include "content/public/browser/notification_database_data.h"
 #include "content/public/browser/platform_notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/service_worker_context.h"
 #include "content/public/common/content_client.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationConstants.h"
 
@@ -72,11 +74,13 @@ NotificationMessageFilter::NotificationMessageFilter(
     int process_id,
     PlatformNotificationContextImpl* notification_context,
     ResourceContext* resource_context,
+    ServiceWorkerContext* service_worker_context,
     BrowserContext* browser_context)
     : BrowserMessageFilter(PlatformNotificationMsgStart),
       process_id_(process_id),
       notification_context_(notification_context),
       resource_context_(resource_context),
+      service_worker_context_(service_worker_context),
       browser_context_(browser_context),
       weak_factory_io_(this) {}
 
@@ -183,12 +187,14 @@ void NotificationMessageFilter::OnShowPersistentNotification(
   notification_context_->WriteNotificationData(
       origin, database_data,
       base::Bind(&NotificationMessageFilter::DidWritePersistentNotificationData,
-                 weak_factory_io_.GetWeakPtr(), request_id, origin,
+                 weak_factory_io_.GetWeakPtr(), request_id,
+                 service_worker_registration_id, origin,
                  sanitized_notification_data, notification_resources));
 }
 
 void NotificationMessageFilter::DidWritePersistentNotificationData(
     int request_id,
+    int64_t service_worker_registration_id,
     const GURL& origin,
     const PlatformNotificationData& notification_data,
     const NotificationResources& notification_resources,
@@ -196,20 +202,51 @@ void NotificationMessageFilter::DidWritePersistentNotificationData(
     int64_t persistent_notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  if (success) {
-    PlatformNotificationService* service =
-        GetContentClient()->browser()->GetPlatformNotificationService();
-    DCHECK(service);
-
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&PlatformNotificationService::DisplayPersistentNotification,
-                   base::Unretained(service),  // The service is a singleton.
-                   browser_context_, persistent_notification_id, origin,
-                   notification_data, notification_resources));
+  if (!success) {
+    Send(new PlatformNotificationMsg_DidShowPersistent(request_id, false));
+    return;
   }
 
-  Send(new PlatformNotificationMsg_DidShowPersistent(request_id, success));
+  // Get the service worker scope.
+  scoped_refptr<content::ServiceWorkerContextWrapper> wrapper =
+      static_cast<content::ServiceWorkerContextWrapper*>(
+          service_worker_context_);

[Peter Beverloo, 2016/07/19 14:17:17]

Storing the SWCW directly (or getting it from the
PlatformNotificationContextImpl) would help here

+  wrapper->FindReadyRegistrationForId(
+      service_worker_registration_id, origin,
+      base::Bind(&NotificationMessageFilter::DidFindServiceWorkerRegistration,
+                 weak_factory_io_.GetWeakPtr(), request_id, origin,
+                 notification_data, notification_resources,
+                 persistent_notification_id));

[pkotwicz, 2016/07/15 19:48:45]

Is it safe to call FindReadyRegistrationForId()? The method seems to have side
effects, notably calling
ServiceWorkerRegistration::ActivateWaitingVersionWhenReady()

I do not know what ServiceWorkerRegistration::ActivateWaitingVersionWhenReady()
does.

[Peter Beverloo, 2016/07/19 14:17:17]

Yeah, that's fine. It's the Service Worker's registration that "owns" this call,
so it'll be running already.

+}
+
+void NotificationMessageFilter::DidFindServiceWorkerRegistration(
+    int request_id,
+    const GURL& origin,
+    const PlatformNotificationData& notification_data,
+    const NotificationResources& notification_resources,
+    int64_t persistent_notification_id,
+    content::ServiceWorkerStatusCode service_worker_status,
+    const scoped_refptr<content::ServiceWorkerRegistration>& registration) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (service_worker_status != SERVICE_WORKER_OK) {
+    Send(new PlatformNotificationMsg_DidShowPersistent(request_id, false));

[Peter Beverloo, 2016/07/19 14:17:17]

nit: Please add a TODO(peter) for adding UMA, as this would be another silent
failure case. A LOG(ERROR) would help too.

+    return;
+  }
+
+  PlatformNotificationService* service =
+      GetContentClient()->browser()->GetPlatformNotificationService();
+  DCHECK(service);
+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&PlatformNotificationService::DisplayPersistentNotification,
+                 base::Unretained(service),  // The service is a singleton.
+                 browser_context_, persistent_notification_id,
+                 registration->pattern(), origin, notification_data,
+                 notification_resources));
+
+  Send(new PlatformNotificationMsg_DidShowPersistent(request_id, true));
 }
 
 void NotificationMessageFilter::OnGetNotifications(