Check embargo status in PlatformNotificationServiceImpl::CheckPermissionOnIOThread

chrome/browser/notifications/platform_notification_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/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
+#include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
@@ skipping 249 matching lines @@
       origin,
       origin,
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       content_settings::ResourceIdentifier());
 
   if (setting == CONTENT_SETTING_ALLOW)
     return blink::mojom::PermissionStatus::GRANTED;
   if (setting == CONTENT_SETTING_BLOCK)
     return blink::mojom::PermissionStatus::DENIED;
 
-  return blink::mojom::PermissionStatus::ASK;
+  // Check whether the permission has been embargoed (automatically blocked).
+  // TODO(crbug.com/658020): make PermissionManager::GetPermissionStatus thread
+  // safe so it isn't necessary to do this HostContentSettingsMap and embargo
+  // check outside of the permissions code.
+  PermissionResult result = PermissionDecisionAutoBlocker::GetEmbargoResult(
+      host_content_settings_map, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
+      base::Time::Now());
+  DCHECK(result.content_setting == CONTENT_SETTING_ASK ||
+         result.content_setting == CONTENT_SETTING_BLOCK);
+  return result.content_setting == CONTENT_SETTING_ASK
+             ? blink::mojom::PermissionStatus::ASK
+             : blink::mojom::PermissionStatus::DENIED;
 }
 
 void PlatformNotificationServiceImpl::DisplayNotification(
     BrowserContext* browser_context,
     const std::string& notification_id,
     const GURL& origin,
     const content::PlatformNotificationData& notification_data,
     const content::NotificationResources& notification_resources,
     std::unique_ptr<content::DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
@@ skipping 234 matching lines @@
 
 void PlatformNotificationServiceImpl::RecordSiteEngagement(
     BrowserContext* browser_context,
     const GURL& origin) {
   // TODO(dominickn, peter): This would be better if the site engagement service
   // could directly observe each notification.
   SiteEngagementService* engagement_service =
       SiteEngagementService::Get(Profile::FromBrowserContext(browser_context));
   engagement_service->HandleNotificationInteraction(origin);
 }