Unregister with push service and SW database when permission is lost.

content/public/browser/push_messaging_service.cc

 // Copyright 2015 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 "content/public/browser/push_messaging_service.h"
 
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
+
+namespace content {
 
 namespace {
 
 const char kNotificationsShownServiceWorkerKey[] =
     "notifications_shown_by_last_few_pushes";
+const char kPushRegistrationIdServiceWorkerKey[] =
+    "push_registration_id";

[johnme, 2015/02/16 20:27:45]

Please add an extern declaration for the one in
content/browser/push_messaging/push_messaging_message_filter.cc in
content/browser/push_messaging/push_messaging_message_filter.h, and #include
that file here (DEPS allows that) instead of redefining this.

[mlamouri (slow - plz ping), 2015/02/16 20:46:03]

Done.

 
-}  // namespace
-
-namespace content {
-
-static void CallGetNotificationsShownCallbackFromIO(
+void CallGetNotificationsShownCallbackFromIO(
     const PushMessagingService::GetNotificationsShownCallback& callback,
     const std::string& data,
     ServiceWorkerStatusCode service_worker_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   bool success = service_worker_status == SERVICE_WORKER_OK;
   bool not_found = service_worker_status == SERVICE_WORKER_ERROR_NOT_FOUND;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, data, success, not_found));
 }
 
-static void CallResultCallbackFromIO(
+void CallResultCallbackFromIO(
     const ServiceWorkerContext::ResultCallback& callback,
     ServiceWorkerStatusCode service_worker_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   bool success = service_worker_status == SERVICE_WORKER_OK;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, success));
 }
 
-static void GetNotificationsShownOnIO(
+void GetNotificationsShownOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper,
     int64 service_worker_registration_id,
     const PushMessagingService::GetNotificationsShownCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   service_worker_context_wrapper->context()->storage()->GetUserData(
       service_worker_registration_id, kNotificationsShownServiceWorkerKey,
       base::Bind(&CallGetNotificationsShownCallbackFromIO, callback));
 }
 
-static void SetNotificationsShownOnIO(
+void SetNotificationsShownOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper,
     int64 service_worker_registration_id, const GURL& origin,
     const std::string& data,
     const PushMessagingService::ResultCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   service_worker_context_wrapper->context()->storage()->StoreUserData(
       service_worker_registration_id, origin,
       kNotificationsShownServiceWorkerKey, data,
       base::Bind(&CallResultCallbackFromIO, callback));
 }
 
+void OnClearPushRegistrationServiceWorkerKey(ServiceWorkerStatusCode status) {
+}
+
+void ClearPushRegistrationIDOnIO(
+    int64 service_worker_registration_id,
+    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context) {

[johnme, 2015/02/16 20:27:45]

Nit: Please swap the argument order, for consistency with other methods.

[mlamouri (slow - plz ping), 2015/02/16 20:46:03]

I guess PushMessagingRouter isn't consistent with this code ;) (I started
writing that code there.)

Done.

+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  service_worker_context->context()->storage()->ClearUserData(
+      service_worker_registration_id,
+      kPushRegistrationIdServiceWorkerKey,
+      base::Bind(&OnClearPushRegistrationServiceWorkerKey));
+}
+
+}  // anonymous namespace
+
 // static
 void PushMessagingService::GetNotificationsShownByLastFewPushes(
     ServiceWorkerContext* service_worker_context,
     int64 service_worker_registration_id,
     const GetNotificationsShownCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   scoped_refptr<ServiceWorkerContextWrapper> wrapper =
       static_cast<ServiceWorkerContextWrapper*>(service_worker_context);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&GetNotificationsShownOnIO,
@@ skipping 14 matching lines @@
       static_cast<ServiceWorkerContextWrapper*>(service_worker_context);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&SetNotificationsShownOnIO,
                                      wrapper,
                                      service_worker_registration_id,
                                      origin,
                                      notifications_shown,
                                      callback));
 }
 
+// static
+void PushMessagingService::ClearPushRegistrationID(
+    BrowserContext* browser_context,
+    const GURL& origin,
+    int64 service_worker_registration_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  StoragePartition* partition =
+      BrowserContext::GetStoragePartitionForSite(browser_context, origin);
+  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context =
+      static_cast<ServiceWorkerContextWrapper*>(
+          partition->GetServiceWorkerContext());
+
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(&ClearPushRegistrationIDOnIO,
+                 service_worker_registration_id,
+                 service_worker_context));
+}
+
 }  // namespace content