Push API: Refactor and fix unsubscribe API

content/public/browser/push_messaging_service.cc

Index: content/public/browser/push_messaging_service.cc
diff --git a/content/public/browser/push_messaging_service.cc b/content/public/browser/push_messaging_service.cc
index f23d1eae6c3a4f847df9225ae014854e25f139ad..de54bc9dcabd03e0f6649d831d3b3ab76aa687f2 100644
--- a/content/public/browser/push_messaging_service.cc
+++ b/content/public/browser/push_messaging_service.cc
@@ -48,7 +48,7 @@ void GetUserDataOnIO(
       base::Bind(&CallStringCallbackFromIO, callback));
 }
 
-void ClearPushSubscriptionIDOnIO(
+void ClearPushSubscriptionIdOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
     int64_t service_worker_registration_id,
     const base::Closure& callback) {
@@ -103,19 +103,17 @@ void PushMessagingService::GetSenderId(BrowserContext* browser_context,
 }
 
 // static
-void PushMessagingService::ClearPushSubscriptionID(
+void PushMessagingService::ClearPushSubscriptionId(
     BrowserContext* browser_context,
     const GURL& origin,
     int64_t service_worker_registration_id,
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&ClearPushSubscriptionIDOnIO,
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&ClearPushSubscriptionIdOnIO,
                  GetServiceWorkerContext(browser_context, origin),
-                 service_worker_registration_id,
-                 callback));
+                 service_worker_registration_id, callback));
 }
 
 // static