Deflake PushMessagingBrowserTest.DenyPushPermissionUnregisters & friends

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 "base/callback.h"
 #include "content/browser/push_messaging/push_messaging_message_filter.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 {
 
@@ skipping 13 matching lines @@
 
 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));
 }
 
+void CallClosureFromIO(const base::Closure& callback,
+                       ServiceWorkerStatusCode status) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
+}
+
 void GetUserDataOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper,
     int64 service_worker_registration_id,
     const std::string& key,
     const PushMessagingService::StringCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   service_worker_context_wrapper->context()->storage()->GetUserData(
       service_worker_registration_id, key,
       base::Bind(&CallStringCallbackFromIO, callback));
 }
 
 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(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
-    int64 service_worker_registration_id) {
+    int64 service_worker_registration_id,
+    const base::Closure& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   service_worker_context->context()->storage()->ClearUserData(
       service_worker_registration_id,
       kPushRegistrationIdServiceWorkerKey,
-      base::Bind(&OnClearPushRegistrationServiceWorkerKey));
+      base::Bind(&CallClosureFromIO, callback));
 }
 
 scoped_refptr<ServiceWorkerContextWrapper> GetServiceWorkerContext(
     BrowserContext* browser_context, const GURL& origin) {
   StoragePartition* partition =
       BrowserContext::GetStoragePartitionForSite(browser_context, origin);
   return make_scoped_refptr(
       static_cast<ServiceWorkerContextWrapper*>(
           partition->GetServiceWorkerContext()));
 }
@@ skipping 48 matching lines @@
                  GetServiceWorkerContext(browser_context, origin),
                  service_worker_registration_id,
                  kPushSenderIdServiceWorkerKey,
                  callback));
 }
 
 // static
 void PushMessagingService::ClearPushRegistrationID(
     BrowserContext* browser_context,
     const GURL& origin,
-    int64 service_worker_registration_id) {
+    int64 service_worker_registration_id,
+    const base::Closure& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ClearPushRegistrationIDOnIO,
                  GetServiceWorkerContext(browser_context, origin),
-                 service_worker_registration_id));
+                 service_worker_registration_id,
+                 callback));
 }
 
 }  // namespace content