Reduce the impact of the push/notification kill switches

chrome/browser/push_messaging/push_messaging_service_impl.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 "chrome/browser/push_messaging/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/base64url.h"
@@ skipping 259 matching lines @@
   PushMessagingAppIdentifier app_identifier =
       PushMessagingAppIdentifier::FindByAppId(profile_, app_id);
   // Drop message and unregister if app_id was unknown (maybe recently deleted).
   if (app_identifier.is_null()) {
     DeliverMessageCallback(app_id, GURL::EmptyGURL(),
                            -1 /* kInvalidServiceWorkerRegistrationId */,
                            message, message_handled_closure,
                            content::PUSH_DELIVERY_STATUS_UNKNOWN_APP_ID);
     return;
   }
-  // Drop message and unregister if |origin| has lost push permission.
-  if (!IsPermissionSet(app_identifier.origin())) {

[johnme, 2017/05/31 13:56:06]

Optional: since you're removing the second last usage of this, you could
consider inlining IsPermissionSet into OnContentSettingChanged.

[Peter Beverloo, 2017/06/02 13:43:37]

Done.

+
+  // Drop message and unregister if |origin| has lost push permission. However,
+  // we should only drop the subscription if the permission was in fact denied
+  // rather than suspended, for example through the kill switch.
+  PermissionResult permission_result =
+      PermissionManager::Get(profile_)->GetPermissionStatus(
+          CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, app_identifier.origin(),
+          app_identifier.origin());
+
+  if (permission_result.content_setting != CONTENT_SETTING_ALLOW) {
+    content::PushDeliveryStatus status =
+        content::PUSH_DELIVERY_STATUS_PERMISSION_DENIED;
+
+    switch (permission_result.source) {
+      case PermissionStatusSource::KILL_SWITCH:
+        status = content::PUSH_DELIVERY_STATUS_PERMISSION_SUSPENDED;
+        break;
+      case PermissionStatusSource::UNSPECIFIED:
+      case PermissionStatusSource::SAFE_BROWSING_BLACKLIST:
+      case PermissionStatusSource::MULTIPLE_DISMISSALS:
+      case PermissionStatusSource::MULTIPLE_IGNORES:
+        status = content::PUSH_DELIVERY_STATUS_PERMISSION_DENIED;
+        break;
+    }
+
     DeliverMessageCallback(app_id, app_identifier.origin(),
                            app_identifier.service_worker_registration_id(),
-                           message, message_handled_closure,
-                           content::PUSH_DELIVERY_STATUS_PERMISSION_DENIED);
+                           message, message_handled_closure, status);
     return;
   }
 
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(),
       "PushMessaging.MessageReceived.Origin", app_identifier.origin());
 
   // The payload of a push message can be valid with content, valid with empty
   // content, or null. Only set the payload data if it is non-null.
   content::PushEventPayload payload;
@@ skipping 66 matching lines @@
       // Do nothing, and hope the error is transient.
       break;
     case content::PUSH_DELIVERY_STATUS_UNKNOWN_APP_ID:
       unsubscribe_reason =
           content::PUSH_UNREGISTRATION_REASON_DELIVERY_UNKNOWN_APP_ID;
       break;
     case content::PUSH_DELIVERY_STATUS_PERMISSION_DENIED:
       unsubscribe_reason =
           content::PUSH_UNREGISTRATION_REASON_DELIVERY_PERMISSION_DENIED;
       break;
+    case content::PUSH_DELIVERY_STATUS_PERMISSION_SUSPENDED:
+      // Do nothing, the kill switch might be withdrawn at some point.
+      break;
     case content::PUSH_DELIVERY_STATUS_NO_SERVICE_WORKER:
       unsubscribe_reason =
           content::PUSH_UNREGISTRATION_REASON_DELIVERY_NO_SERVICE_WORKER;
       break;
   }
 
   if (unsubscribe_reason != content::PUSH_UNREGISTRATION_REASON_UNKNOWN) {
     PushMessagingAppIdentifier app_identifier =
         PushMessagingAppIdentifier::FindByAppId(profile_, app_id);
     UnsubscribeInternal(
@@ skipping 655 matching lines @@
 }
 
 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()
     const {
   instance_id::InstanceIDProfileService* instance_id_profile_service =
       instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_);
   CHECK(instance_id_profile_service);
   CHECK(instance_id_profile_service->driver());
   return instance_id_profile_service->driver();
 }