Implement WebPushProvider.unregister() in Chromium.

chrome/browser/services/gcm/push_messaging_service_impl.cc

Index: chrome/browser/services/gcm/push_messaging_service_impl.cc
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc
index d1dda2e76abb3d72f80b3bfa829c553e8714c15c..0d5cffb2ec2867e1ab5d62aef5765b8caa57ad6d 100644
--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc
@@ -158,7 +158,7 @@ void PushMessagingServiceImpl::OnMessage(
     if (!HasPermission(application_id.origin)) {
       // The |origin| lost push permission. We need to unregister and drop this
       // message.
-      Unregister(application_id);
+      Unregister(application_id, UnregisterCallback());
       return;
     }
 
@@ -197,7 +197,7 @@ void PushMessagingServiceImpl::DeliverMessageCallback(
     case content::PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED:
       break;
     case content::PUSH_DELIVERY_STATUS_NO_SERVICE_WORKER:
-      Unregister(application_id);
+      Unregister(application_id, UnregisterCallback());
       break;
   }
 }
@@ -414,22 +414,56 @@ void PushMessagingServiceImpl::DidRequestPermission(
 }
 
 void PushMessagingServiceImpl::Unregister(
-    const PushMessagingApplicationId& application_id) {
+    const GURL& requesting_origin,
+    int64 service_worker_registration_id,
+    const content::PushMessagingService::UnregisterCallback& callback) {
+  DCHECK(gcm_profile_service_->driver());
+
+  PushMessagingApplicationId application_id = PushMessagingApplicationId(
+      requesting_origin, service_worker_registration_id);
+  DCHECK(application_id.IsValid());
+
+  Unregister(application_id, callback);
+}
+
+void PushMessagingServiceImpl::Unregister(
+    const PushMessagingApplicationId& application_id,
+    const content::PushMessagingService::UnregisterCallback& callback) {
   DCHECK(gcm_profile_service_->driver());
 
   gcm_profile_service_->driver()->Unregister(
       application_id.ToString(),
       base::Bind(&PushMessagingServiceImpl::DidUnregister,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr(), callback));
 }
 
-void PushMessagingServiceImpl::DidUnregister(GCMClient::Result result) {
-  if (result != GCMClient::SUCCESS) {
-    DVLOG(1) << "GCM unregistration failed.";
-    return;
+void PushMessagingServiceImpl::DidUnregister(
+    const content::PushMessagingService::UnregisterCallback& callback,
+    GCMClient::Result result) {
+  switch (result) {
+  case GCMClient::SUCCESS:
+    callback.Run(content::PUSH_UNREGISTRATION_SUCCESS_UNREGISTER);
+    break;
+  case GCMClient::NETWORK_ERROR:
+  case GCMClient::SERVER_ERROR:

[johnme, 2014/12/16 16:31:59]

I don't know if SERVER_ERROR ("Problem at the server." according to [1]) should
be considered a network error. Perhaps UNKNOWN_ERROR is more suitable?

[1]:
https://code.google.com/p/chromium/codesearch#chromium/src/components/gcm_dri...

[mlamouri (slow - plz ping), 2014/12/16 18:26:16]

Done.

+  case GCMClient::TTL_EXCEEDED:
+    callback.Run(content::PUSH_UNREGISTRATION_NETWORK_ERROR);
+    break;
+  case GCMClient::INVALID_PARAMETER:
+  case GCMClient::GCM_DISABLED:
+  case GCMClient::NOT_SIGNED_IN:
+  case GCMClient::ASYNC_OPERATION_PENDING:
+  case GCMClient::UNKNOWN_ERROR:
+    callback.Run(content::PUSH_UNREGISTRATION_UNKNOWN_ERROR);
+    break;
+  default:
+    NOTREACHED() << "Unexpected GCMClient::Result value.";
+    callback.Run(content::PUSH_UNREGISTRATION_UNKNOWN_ERROR);
+    break;
   }
 
-  DecreasePushRegistrationCount(1);
+  if (result == GCMClient::SUCCESS)
+    DecreasePushRegistrationCount(1);
 }
 
 bool PushMessagingServiceImpl::HasPermission(const GURL& origin) {