Revert of Plumb Push Event's WebServiceWorkerEventResult to browser status enum (patchset #3 id:40001 of https://codereview.chromium.org/717083004/)

Reason for revert:
Compiler errors on android:

http://build.chromium.org/p/chromium/buildstatus?builder=Android&number=31434

Original issue's description:
> Plumb Push Event's WebServiceWorkerEventResult to browser status enum
>
> This will later allow us to log to UMA how often Service Worker JS
> passes a rejected Promise to event.waitUntil inside the Push event.
>
> BUG=401438
>
> Committed: https://crrev.com/6d4f18c990de761829814696e54bc33055ee922c
> Cr-Commit-Position: refs/heads/master@{#305855}

TBR=peter@chromium.org,palmer@chromium.org,michaeln@chromium.org,avi@chromium.org,mvanouwerkerk@chromium.org,johnme@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=401438

Review URL: https://codereview.chromium.org/757403002

Cr-Commit-Position: refs/heads/master@{#305864}

9 files changed, 12 insertions, 51 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,
diff --git a/content/browser/service_worker/service_worker_registration_status.cc b/content/browser/service_worker/service_worker_registration_status.cc
index 250fb3b..e67b833 100644
--- a/content/browser/service_worker/service_worker_registration_status.cc
+++ b/content/browser/service_worker/service_worker_registration_status.cc
@@ -48,7 +48,6 @@ void GetServiceWorkerRegistrationStatusResponse(
     case SERVICE_WORKER_ERROR_FAILED:
     case SERVICE_WORKER_ERROR_PROCESS_NOT_FOUND:
     case SERVICE_WORKER_ERROR_EXISTS:
-    case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
       // Unexpected, or should have bailed out before calling this, or we don't
       // have a corresponding blink error code yet.
       break;  // Fall through to NOTREACHED().
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index ea621e5..bea893b 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -737,8 +737,7 @@ void ServiceWorkerVersion::OnSyncEventFinished(
 }
 
 void ServiceWorkerVersion::OnPushEventFinished(
-    int request_id,
-    blink::WebServiceWorkerEventResult result) {
+    int request_id) {
   TRACE_EVENT1("ServiceWorker",
                "ServiceWorkerVersion::OnPushEventFinished",
                "Request id", request_id);
@@ -747,12 +746,9 @@ void ServiceWorkerVersion::OnPushEventFinished(
     NOTREACHED() << "Got unexpected message: " << request_id;
     return;
   }
-  ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
-  if (result == blink::WebServiceWorkerEventResultRejected)
-    status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
 
   scoped_refptr<ServiceWorkerVersion> protect(this);
-  callback->Run(status);
+  callback->Run(SERVICE_WORKER_OK);
   push_callbacks_.Remove(request_id);
 }
 
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 01383064..fd8db5a 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -287,8 +287,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
                             ServiceWorkerFetchEventResult result,
                             const ServiceWorkerResponse& response);
   void OnSyncEventFinished(int request_id);
-  void OnPushEventFinished(int request_id,
-                           blink::WebServiceWorkerEventResult result);
+  void OnPushEventFinished(int request_id);
   void OnGeofencingEventFinished(int request_id);
   void OnPostMessageToDocument(int client_id,
                                const base::string16& message,
diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h
index f9ebecc..7672048 100644
--- a/content/common/service_worker/service_worker_messages.h
+++ b/content/common/service_worker/service_worker_messages.h
@@ -187,9 +187,8 @@ IPC_MESSAGE_ROUTED3(ServiceWorkerHostMsg_FetchEventFinished,
                     content::ServiceWorkerResponse)
 IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_SyncEventFinished,
                     int /* request_id */)
-IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_PushEventFinished,
-                    int /* request_id */,
-                    blink::WebServiceWorkerEventResult)
+IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_PushEventFinished,
+                    int /* request_id */)
 IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GeofencingEventFinished,
                     int /* request_id */)
 
diff --git a/content/common/service_worker/service_worker_status_code.cc b/content/common/service_worker/service_worker_status_code.cc
index f5c1e02..a402a8a 100644
--- a/content/common/service_worker/service_worker_status_code.cc
+++ b/content/common/service_worker/service_worker_status_code.cc
@@ -34,9 +34,6 @@ const char* ServiceWorkerStatusToString(ServiceWorkerStatusCode status) {
       return "Operation failed by network issue";
     case SERVICE_WORKER_ERROR_SECURITY:
       return "Operation failed by security issue";
-    case SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED:
-      return "ServiceWorker failed to handle event (event.waitUntil "
-             "Promise rejected)";
   }
   NOTREACHED();
   return "";
diff --git a/content/common/service_worker/service_worker_status_code.h b/content/common/service_worker/service_worker_status_code.h
index e87e5c3..953d533 100644
--- a/content/common/service_worker/service_worker_status_code.h
+++ b/content/common/service_worker/service_worker_status_code.h
@@ -48,9 +48,6 @@ enum ServiceWorkerStatusCode {
 
   // Operation is failed by security issue.
   SERVICE_WORKER_ERROR_SECURITY,
-
-  // Event handling failed (event.waitUntil Promise rejected).
-  SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED,
 };
 
 CONTENT_EXPORT const char* ServiceWorkerStatusToString(
diff --git a/content/public/common/push_messaging_status.h b/content/public/common/push_messaging_status.h
index 6ac9d96..22351ca 100644
--- a/content/public/common/push_messaging_status.h
+++ b/content/public/common/push_messaging_status.h
@@ -51,14 +51,10 @@ enum PushDeliveryStatus {
   // The message could not be delivered because of a service worker error.
   PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR,
 
-  // The message was delivered, but the Service Worker passed a Promise to
-  // event.waitUntil that got rejected.
-  PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED,
-
   // When making changes, update PUSH_DELIVERY_STATUS_LAST below.
 
   // Used for IPC message range checks.
-  PUSH_DELIVERY_STATUS_LAST = PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED
+  PUSH_DELIVERY_STATUS_LAST = PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR
 };
 
 const char* PushRegistrationStatusToString(PushRegistrationStatus status);
diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
index baf9060..33f4dd0 100644
--- a/content/renderer/service_worker/service_worker_script_context.cc
+++ b/content/renderer/service_worker/service_worker_script_context.cc
@@ -132,6 +132,7 @@ void ServiceWorkerScriptContext::DidHandleFetchEvent(
 void ServiceWorkerScriptContext::DidHandlePushEvent(
     int request_id,
     blink::WebServiceWorkerEventResult result) {
+  // TODO(johnme): Plumb through the result.
   if (result == blink::WebServiceWorkerEventResultCompleted) {
     UMA_HISTOGRAM_TIMES(
         "ServiceWorker.PushEventExecutionTime",
@@ -140,7 +141,7 @@ void ServiceWorkerScriptContext::DidHandlePushEvent(
   push_start_timings_.erase(request_id);
 
   Send(new ServiceWorkerHostMsg_PushEventFinished(
-      GetRoutingID(), request_id, result));
+      GetRoutingID(), request_id));
 }
 
 void ServiceWorkerScriptContext::DidHandleSyncEvent(int request_id) {