Push API: Fix unsubscribing from GCM on Android

chrome/browser/services/gcm/push_messaging_service_impl.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 "chrome/browser/services/gcm/push_messaging_service_impl.h"
 
 #include <bitset>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 180 matching lines @@
 
   // Drop messages whose application is is invalid.
   if (!application_id.IsValid()) {
     DeliverMessageCallback(application_id, message,
                            content::PUSH_DELIVERY_STATUS_INVALID_MESSAGE);
     return;
   }
 
   // |origin| may have lost push permission. Unregister and drop this message.
   if (!HasPermission(application_id.origin)) {
-    Unregister(application_id, UnregisterCallback());
+    Unregister(application_id, message.sender_id, UnregisterCallback());
     return;
   }
 
   std::string data;
 
   // TODO(peter): Message payloads are disabled pending mandatory encryption.
   // https://crbug.com/449184
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePushMessagePayload)) {
     GCMClient::MessageData::const_iterator it = message.data.find("data");
@@ skipping 29 matching lines @@
     // Worker JS, even if the website's event handler failed (to prevent sites
     // deliberately failing in order to avoid having to show notifications).
     case content::PUSH_DELIVERY_STATUS_SUCCESS:
     case content::PUSH_DELIVERY_STATUS_EVENT_WAITUNTIL_REJECTED:
       RequireUserVisibleUX(application_id);
       break;
     case content::PUSH_DELIVERY_STATUS_INVALID_MESSAGE:
     case content::PUSH_DELIVERY_STATUS_SERVICE_WORKER_ERROR:
       break;
     case content::PUSH_DELIVERY_STATUS_NO_SERVICE_WORKER:
-      Unregister(application_id, UnregisterCallback());
+      Unregister(application_id, message.sender_id, UnregisterCallback());
       break;
   }
 }
 
 void PushMessagingServiceImpl::RequireUserVisibleUX(
     const PushMessagingApplicationId& application_id) {
 #if defined(ENABLE_NOTIFICATIONS)
   // TODO(johnme): Relax this heuristic slightly.
   PlatformNotificationServiceImpl* notification_service =
       PlatformNotificationServiceImpl::GetInstance();
@@ skipping 311 matching lines @@
       application_id.ToString(),
       sender_ids,
       base::Bind(&PushMessagingServiceImpl::DidRegister,
                  weak_factory_.GetWeakPtr(),
                  register_callback));
 }
 
 void PushMessagingServiceImpl::Unregister(
     const GURL& requesting_origin,
     int64 service_worker_registration_id,
+    const std::string& sender_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);
+  Unregister(application_id, sender_id, callback);
 }
 
 void PushMessagingServiceImpl::Unregister(
     const PushMessagingApplicationId& application_id,
+    const std::string& sender_id,
     const content::PushMessagingService::UnregisterCallback& callback) {
   DCHECK(gcm_profile_service_->driver());
 
   gcm_profile_service_->driver()->Unregister(
       application_id.ToString(),
+      std::vector<std::string>(1, sender_id),
       base::Bind(&PushMessagingServiceImpl::DidUnregister,
                  weak_factory_.GetWeakPtr(), callback));
 }
 
 void PushMessagingServiceImpl::DidUnregister(
     const content::PushMessagingService::UnregisterCallback& callback,
     GCMClient::Result result) {
   // Internal calls pass a null callback.
   if (!callback.is_null()) {
     switch (result) {
@@ skipping 25 matching lines @@
 bool PushMessagingServiceImpl::HasPermission(const GURL& origin) {
   gcm::PushMessagingPermissionContext* permission_context =
       gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_);
   DCHECK(permission_context);
 
   return permission_context->GetPermissionStatus(origin, origin) ==
       CONTENT_SETTING_ALLOW;
 }
 
 }  // namespace gcm