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;

[Peter Beverloo, 2016/09/30 14:26:07]

Is there any way a layout test can end up in this situation? I don't think it's
very useful to add this logic (even if it were here to mirror the actual Impl)
if it's an impossible case.

Maybe calling PushSubscription.unsubscribe() twice might work? Can we check the
result values of that?

[johnme, 2016/09/30 17:02:10]

Yes, it can. There are layout tests that explicitly test that if you call
unsubscribe twice the 2nd one returns false (due to
PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED). They started failing
when I made PMMF call through to PMSI even if the SW database does not contain a
subscription ID. This is the minimal implementation that makes those tests pass
again.

 }
 
 }  // namespace content