Push API: Prevent DCHECK when clear permissions after clear SW DB

chrome/browser/push_messaging/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/push_messaging/push_messaging_service_impl.h"
 
 #include <bitset>
 #include <vector>
 
 #include "base/barrier_closure.h"
@@ skipping 631 matching lines @@
   bool was_registered = application_id.IsValid();
   if (was_registered)
     application_id.DeleteFromDisk(profile_);
 
   const auto& unregister_callback =
       base::Bind(&PushMessagingServiceImpl::DidUnregister,
                  weak_factory_.GetWeakPtr(),
                  was_registered, callback);
 #if defined(OS_ANDROID)
   // On Android the backend is different, and requires the original sender_id.
-  GetGCMDriver()->UnregisterWithSenderId(app_id_guid, sender_id,
-                                         unregister_callback);
+  // UnregisterBecausePermissionRevoked sometimes calls us with an empty one.
+  if (sender_id.empty())
+    unregister_callback.Run(gcm::GCMClient::INVALID_PARAMETER);
+  else
+    GetGCMDriver()->UnregisterWithSenderId(app_id_guid, sender_id,
+                                           unregister_callback);
 #else
   GetGCMDriver()->Unregister(app_id_guid, unregister_callback);
 #endif
 }
 
 void PushMessagingServiceImpl::DidUnregister(
     bool was_registered,
     const content::PushMessagingService::UnregisterCallback& callback,
     gcm::GCMClient::Result result) {
   if (was_registered)
@@ skipping 70 matching lines @@
             weak_factory_.GetWeakPtr(), id, barrier_closure));
   }
 }
 
 void PushMessagingServiceImpl::UnregisterBecausePermissionRevoked(
     const PushMessagingApplicationId& id, const base::Closure& closure,
     const std::string& sender_id, bool success, bool not_found) {
   base::Closure barrier_closure = base::BarrierClosure(2, closure);
 
   // Unregister the PushMessagingApplicationId with the push service.
+  // It's possible for GetSenderId to have failed and sender_id to be empty, if
+  // cookies (and the SW database) for an origin got cleared before permissions
+  // are cleared for the origin. In that case Unregister will just delete the
+  // application ID to block future messages.
+  // TODO(johnme): Auto-unregister before SW DB is cleared
+  // (https://crbug.com/402458).
   Unregister(id.app_id_guid(), sender_id,
              base::Bind(&UnregisterCallbackToClosure, barrier_closure));
 
   // Clear the associated service worker push registration id.
   ClearPushRegistrationID(profile_, id.origin(),
                           id.service_worker_registration_id(), barrier_closure);
 }
 
 void PushMessagingServiceImpl::SetContentSettingChangedCallbackForTesting(
       const base::Closure& callback) {
@@ skipping 17 matching lines @@
       CONTENT_SETTING_ALLOW;
 }
 
 gcm::GCMDriver* PushMessagingServiceImpl::GetGCMDriver() const {
   gcm::GCMProfileService* gcm_profile_service =
       gcm::GCMProfileServiceFactory::GetForProfile(profile_);
   CHECK(gcm_profile_service);
   CHECK(gcm_profile_service->driver());
   return gcm_profile_service->driver();
 }