[WebAPKs] Plumb service worker scope to notifications

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"
@@ skipping 120 matching lines @@
   // renaming the method in the NotificationDispatcher if this makes sense.
   int request_id =
       notification_dispatcher_->GenerateNotificationId(CurrentWorkerId());
 
   pending_show_notification_requests_.AddWithID(owned_callbacks.release(),
                                                 request_id);
 
   // 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_ShowPersistent(
-      request_id, service_worker_registration_id,
-      blink::WebStringToGURL(origin.toString()),
-      ToPlatformNotificationData(notification_data),
-      ToNotificationResources(std::move(notification_resources))));
+  PlatformNotificationHostMsg_ShowPersistent_Params params;
+  params.request_id = request_id;
+  params.service_worker_registration_id = service_worker_registration_id;
+  params.service_worker_scope = service_worker_registration->scope();
+  params.origin = blink::WebStringToGURL(origin.toString());
+  params.notification_data = ToPlatformNotificationData(notification_data);
+  params.notification_resources =
+      ToNotificationResources(std::move(notification_resources));
+  thread_safe_sender_->Send(
+      new PlatformNotificationHostMsg_ShowPersistent(params));
 }
 
 void NotificationManager::getNotifications(
     const blink::WebString& filter_tag,
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebNotificationGetCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
 
   WebServiceWorkerRegistrationImpl* service_worker_registration_impl =
@@ skipping 130 matching lines @@
 
     notifications[i] = web_notification_info;
   }
 
   callbacks->onSuccess(notifications);
 
   pending_get_notification_requests_.Remove(request_id);
 }
 
 }  // namespace content