diff options
Diffstat (limited to 'content/browser/push_messaging/push_messaging_router.cc')
| -rw-r--r-- | content/browser/push_messaging/push_messaging_router.cc | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/content/browser/push_messaging/push_messaging_router.cc b/content/browser/push_messaging/push_messaging_router.cc index b11dace..fc5218a 100644 --- a/content/browser/push_messaging/push_messaging_router.cc +++ b/content/browser/push_messaging/push_messaging_router.cc @@ -8,7 +8,6 @@ #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_status_code.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" @@ -92,32 +91,10 @@ void PushMessagingRouter::DeliverMessageEnd( ServiceWorkerStatusCode service_worker_status) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); // TODO(mvanouwerkerk): UMA logging. - PushDeliveryStatus delivery_status; - 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: - case SERVICE_WORKER_ERROR_ABORT: - case SERVICE_WORKER_ERROR_START_WORKER_FAILED: - case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND: - case SERVICE_WORKER_ERROR_NOT_FOUND: - case SERVICE_WORKER_ERROR_IPC_FAILED: - delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; - break; - case SERVICE_WORKER_ERROR_EXISTS: - case SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED: - case SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED: - case SERVICE_WORKER_ERROR_NETWORK: - case SERVICE_WORKER_ERROR_SECURITY: - NOTREACHED() << "Got unexpected error code: " << service_worker_status - << " " << ServiceWorkerStatusToString(service_worker_status); - delivery_status = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; - break; - } + PushDeliveryStatus delivery_status = + service_worker_status == SERVICE_WORKER_OK + ? PUSH_DELIVERY_STATUS_SUCCESS + : PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR; BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, |