Push API: Refactor and fix unsubscribe API

content/shell/browser/layout_test/layout_test_push_messaging_service.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 "content/shell/browser/layout_test/layout_test_push_messaging_service.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "content/public/browser/permission_type.h"
@@ skipping 71 matching lines @@
     int64_t service_worker_registration_id,
     const PushSubscriptionOptions& options,
     const PushMessagingService::RegisterCallback& callback) {
   if (GetPermissionStatus(requesting_origin, options.user_visible_only) ==
       blink::WebPushPermissionStatusGranted) {
     std::vector<uint8_t> p256dh(
         kTestP256Key, kTestP256Key + arraysize(kTestP256Key));
     std::vector<uint8_t> auth(
         kAuthentication, kAuthentication + arraysize(kAuthentication));
 
+    is_subscribed_ = true;
     callback.Run("layoutTestRegistrationId", p256dh, auth,
                  PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE);
   } else {
     callback.Run("registration_id", std::vector<uint8_t>() /* p256dh */,
                  std::vector<uint8_t>() /* auth */,
                  PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
   }
 }
 
 void LayoutTestPushMessagingService::GetEncryptionInfo(
@@ skipping 20 matching lines @@
 
 bool LayoutTestPushMessagingService::SupportNonVisibleMessages() {
   return false;
 }
 
 void LayoutTestPushMessagingService::Unsubscribe(
     const GURL& requesting_origin,
     int64_t service_worker_registration_id,
     const std::string& sender_id,
     const UnregisterCallback& callback) {
-  callback.Run(PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED);
+  ClearPushSubscriptionId(
+      LayoutTestContentBrowserClient::Get()->browser_context(),
+      requesting_origin, service_worker_registration_id,
+      base::Bind(callback,
+                 is_subscribed_
+                     ? PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED
+                     : PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED));
+  is_subscribed_ = false;
 }
 
 }  // namespace content