Push API: Don't unsubscribe when finding Service Worker fails

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 "base/metrics/histogram_macros.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"
 #include "content/public/common/push_event_payload.h"
 
@@ skipping 48 matching lines @@
                  payload, deliver_message_callback));
 }
 
 // static
 void PushMessagingRouter::FindServiceWorkerRegistrationCallback(
     const PushEventPayload& payload,
     const DeliverMessageCallback& deliver_message_callback,
     ServiceWorkerStatusCode service_worker_status,
     scoped_refptr<ServiceWorkerRegistration> service_worker_registration) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  // TODO(mvanouwerkerk): UMA logging.
+  UMA_HISTOGRAM_ENUMERATION("PushMessaging.DeliveryStatus.FindServiceWorker",
+                            service_worker_status,
+                            SERVICE_WORKER_ERROR_MAX_VALUE);
+  if (service_worker_status == SERVICE_WORKER_ERROR_NOT_FOUND) {
+    RunDeliverCallback(deliver_message_callback,
+                       PUSH_DELIVERY_STATUS_NO_SERVICE_WORKER);
+    return;
+  }
   if (service_worker_status != SERVICE_WORKER_OK) {
     RunDeliverCallback(deliver_message_callback,
-                       PUSH_DELIVERY_STATUS_NO_SERVICE_WORKER);
+                       PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR);
     return;
   }
 
   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.
@@ skipping 20 matching lines @@
   service_worker->DispatchSimpleEvent<ServiceWorkerHostMsg_PushEventFinished>(
       request_id, ServiceWorkerMsg_PushEvent(request_id, payload));
 }
 
 // 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.
+  UMA_HISTOGRAM_ENUMERATION("PushMessaging.DeliveryStatus.ServiceWorkerEvent",
+                            service_worker_status,
+                            SERVICE_WORKER_ERROR_MAX_VALUE);
   PushDeliveryStatus delivery_status =
       PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR;
   switch (service_worker_status) {
     case SERVICE_WORKER_OK:
       delivery_status = PUSH_DELIVERY_STATUS_SUCCESS;
       break;
     case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
       delivery_status = PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED;
       break;
     case SERVICE_WORKER_ERROR_FAILED:
@@ skipping 18 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