Move push event dispatching out of ServiceWorkerVersion.

content/browser/push_messaging/push_messaging_router.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/browser/push_messaging/push_messaging_router.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_storage.h"
+#include "content/common/service_worker/service_worker_messages.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 
 namespace content {
 
 namespace {
 
 void RunDeliverCallback(
     const PushMessagingRouter::DeliverMessageCallback& deliver_message_callback,
     PushDeliveryStatus delivery_status) {
   BrowserThread::PostTask(

[johnme, 2016/01/18 19:06:19]

Nit: While you're touching this file, please add a
DCHECK_CURRENTLY_ON(BrowserThread::IO) here :)

[Marijn Kruisselbrink, 2016/01/20 01:06:31]

Done

       BrowserThread::UI, FROM_HERE,
       base::Bind(deliver_message_callback, delivery_status));
 }
 
+void OnPushEventResponse(scoped_refptr<ServiceWorkerVersion> service_worker,

[johnme, 2016/01/18 19:06:19]

[see comment in .h first]

Please add DCHECK_CURRENTLY_ON(BrowserThread::IO).

[Marijn Kruisselbrink, 2016/01/20 01:06:31]

Done

+                         base::Callback<void(ServiceWorkerStatusCode)> callback,
+                         int request_id,
+                         blink::WebServiceWorkerEventResult result) {
+  TRACE_EVENT1("ServiceWorker", "PushMessagingRouter::OnPushEventResponse",
+               "Request id", request_id);
+
+  service_worker->FinishRequest(request_id);

[johnme, 2016/01/18 19:06:19]

[see comment in .h first]

Please apply equivalent tweaks as in https://codereview.chromium.org/1575283003,
e.g. check the return value of FinishEvent.

[Marijn Kruisselbrink, 2016/01/20 01:06:31]

Done

+
+  ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
+  if (result == blink::WebServiceWorkerEventResultRejected)
+    status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
+  callback.Run(status);
+}
+
 }  // namespace
 
 // static
 void PushMessagingRouter::DeliverMessage(
     BrowserContext* browser_context,
     const GURL& origin,
     int64_t service_worker_registration_id,
     const std::string& data,
     const DeliverMessageCallback& deliver_message_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   StoragePartition* partition =
       BrowserContext::GetStoragePartitionForSite(browser_context, origin);
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context =
       static_cast<ServiceWorkerContextWrapper*>(
           partition->GetServiceWorkerContext());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PushMessagingRouter::FindServiceWorkerRegistration, origin,
                  service_worker_registration_id, data, deliver_message_callback,
                  service_worker_context));
 }
 
 // static
+void PushMessagingRouter::DeliverMessageToWorker(

[johnme, 2016/01/18 19:06:19]

[see comment in .h first]

Nit: please move this between
PushMessagingRouter::FindServiceWorkerRegistrationCallback and
PushMessagingRouter::DeliverMessageEnd to keep them in order of execution.

[Marijn Kruisselbrink, 2016/01/20 01:06:31]

That would go against the chromium coding style: "Function declaration order
should match function definition order." (and I can't reorder the declaration
order since all public methods should come before all private methods).

+    const scoped_refptr<ServiceWorkerVersion>& service_worker,
+    const std::string& data,
+    const base::Callback<void(ServiceWorkerStatusCode)>& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (service_worker->running_status() != ServiceWorkerVersion::RUNNING) {

[johnme, 2016/01/18 19:06:19]

[see comment in .h first]

Nit: In https://codereview.chromium.org/1575283003/
DispatchNotificationClickEventOnWorker is always called from
RunAfterStartWorker, whereas here DeliverMessageToWorker is called directly and
passes itself to RunAfterStartWorker.

I don't really mind which you go with, but it seems cleaner to do the same in
both unless there's a fundamental difference.

[Marijn Kruisselbrink, 2016/01/20 01:06:31]

The reason for the difference was to keep the changes to
ServiceWorkerInternalsUI minimal. In general I prefer the what I did in the
notification click patch, but to do that here would require adding a
RunAfterStartWorker call in ServiceWorkerInternalsUI (which I'm happy to add if
you prefer them to be the same).

+    service_worker->RunAfterStartWorker(
+        callback, base::Bind(&PushMessagingRouter::DeliverMessageToWorker,
+                             service_worker, data, callback));
+    return;
+  }
+
+  int request_id = service_worker->StartRequest(
+      ServiceWorkerMetrics::EventType::PUSH, callback);
+  service_worker->DispatchEvent<ServiceWorkerHostMsg_PushEventFinished>(
+      request_id, ServiceWorkerMsg_PushEvent(request_id, data),
+      base::Bind(&OnPushEventResponse, service_worker, callback));
+}
+
+// static
 void PushMessagingRouter::FindServiceWorkerRegistration(
     const GURL& origin,
     int64_t service_worker_registration_id,
     const std::string& data,
     const DeliverMessageCallback& deliver_message_callback,
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Try to acquire the registration from storage. If it's already live we'll
   // receive it right away. If not, it will be revived from storage.
   service_worker_context->FindReadyRegistrationForId(
@@ skipping 20 matching lines @@
   ServiceWorkerVersion* version = service_worker_registration->active_version();
   DCHECK(version);
 
   // Hold on to the service worker registration in the callback to keep it
   // alive until the callback dies. Otherwise the registration could be
   // released when this method returns - before the event is delivered to the
   // service worker.
   base::Callback<void(ServiceWorkerStatusCode)> dispatch_event_callback =
       base::Bind(&PushMessagingRouter::DeliverMessageEnd,
                  deliver_message_callback, service_worker_registration);
-
-  version->DispatchPushEvent(dispatch_event_callback, data);
+  DeliverMessageToWorker(version, data, dispatch_event_callback);
 }
 
 // static
 void PushMessagingRouter::DeliverMessageEnd(
     const DeliverMessageCallback& deliver_message_callback,
     const scoped_refptr<ServiceWorkerRegistration>& service_worker_registration,
     ServiceWorkerStatusCode service_worker_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // TODO(mvanouwerkerk): UMA logging.
   PushDeliveryStatus delivery_status =
@@ skipping 27 matching lines @@
     case SERVICE_WORKER_ERROR_MAX_VALUE:
       NOTREACHED() << "Got unexpected error code: " << service_worker_status
                    << " " << ServiceWorkerStatusToString(service_worker_status);
       delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
       break;
   }
   RunDeliverCallback(deliver_message_callback, delivery_status);
 }
 
 }  // namespace content