Move push event dispatching out of ServiceWorkerVersion.

content/browser/push_messaging/push_messaging_router.h

 // 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.
 
 #ifndef CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_ROUTER_H_
 #define CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_ROUTER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/common/push_messaging_status.h"
+#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class BrowserContext;
 class ServiceWorkerContextWrapper;
 class ServiceWorkerRegistration;
+class ServiceWorkerVersion;
 
 class PushMessagingRouter {
  public:
   typedef base::Callback<void(PushDeliveryStatus)> DeliverMessageCallback;
 
   // Delivers a push message with |data| to the Service Worker identified by
   // |origin| and |service_worker_registration_id|. Must be called on the UI
   // thread.
   static void DeliverMessage(
       BrowserContext* browser_context,
@@ skipping 15 matching lines @@
   // If a registration was successfully retrieved, dispatches a push event with
   // |data| on the Service Worker identified by |service_worker_registration|.
   // Must be called on the IO thread.
   static void FindServiceWorkerRegistrationCallback(
       const std::string& data,
       const DeliverMessageCallback& deliver_message_callback,
       ServiceWorkerStatusCode service_worker_status,
       const scoped_refptr<ServiceWorkerRegistration>&
           service_worker_registration);
 
-  // Gets called asynchronously after the Service Worker has dispatched the push
-  // event. Must be called on the IO thread.
-  static void DeliverMessageEnd(
+  // Delivers a push message with |data| to a specific |service_worker|. Must be
+  // called on the IO thread, with a the worker running.

[johnme, 2016/01/22 14:35:37]

s/a the/the/

[Marijn Kruisselbrink, 2016/01/23 00:02:19]

Done

+  static void DeliverMessageToWorker(
+      const scoped_refptr<ServiceWorkerVersion>& service_worker,
+      const scoped_refptr<ServiceWorkerRegistration>&
+          service_worker_registration,
+      const std::string& data,
+      const DeliverMessageCallback& deliver_message_callback);
+
+  // Gets called asynchronously if dispatching a push event has failed. Must be
+  // called on the IO thread.
+  static void DeliverMessageFailed(
       const DeliverMessageCallback& deliver_message_callback,
       const scoped_refptr<ServiceWorkerRegistration>&
           service_worker_registration,
       ServiceWorkerStatusCode service_worker_status);
 
+  // Gets called asynchronously after the Service Worker has dispatched the push
+  // event with the result from the renderer. Must be called on the IO thread.
+  static void DeliverMessageFinished(
+      const DeliverMessageCallback& deliver_message_callback,
+      const scoped_refptr<ServiceWorkerVersion>& service_worker,
+      const scoped_refptr<ServiceWorkerRegistration>&
+          service_worker_registration,
+      int request_id,
+      blink::WebServiceWorkerEventResult result);
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(PushMessagingRouter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_ROUTER_H_