Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

chrome/browser/budget_service/budget_service_impl.cc

 // Copyright 2016 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/budget_service/budget_service_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/budget_service/budget_manager.h"
 #include "chrome/browser/budget_service/budget_manager_factory.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
+#include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_process_host.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 BudgetServiceImpl::BudgetServiceImpl(int render_process_id)
     : render_process_id_(render_process_id) {}
 
 BudgetServiceImpl::~BudgetServiceImpl() = default;
 
@@ skipping 34 matching lines @@
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
 
   PermissionManager* permission_manager =
       PermissionManagerFactory::GetForProfile(profile);
   DCHECK(permission_manager);
 
   // By request of the Privacy Team, we only communicate the budget buckets with
   // the developer when the notification permission has been granted. This is
   // something the impact of which has to be reconsidered when the feature is
   // ready to ship for real. See https://crbug.com/710809 for context.
-  if (permission_manager->GetPermissionStatus(
-          content::PermissionType::NOTIFICATIONS, origin.GetURL(), GURL()) !=
-      blink::mojom::PermissionStatus::GRANTED) {
+  if (permission_manager
+          ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

[johnme, 2017/06/12 10:18:20]

This loses the call to UpdatePermissionStatusWithDeviceStatus. It appears that
NotificationPermissionContext doesn't yet override that, but I wonder if it
might in future, e.g. due to https://crbug.com/700377

+                                origin.GetURL(), GURL())
+          .content_setting != CONTENT_SETTING_ALLOW) {
     blink::mojom::BudgetStatePtr empty_state(blink::mojom::BudgetState::New());
     empty_state->budget_at = 0;
     empty_state->time =
         base::Time::Now().ToDoubleT() * base::Time::kMillisecondsPerSecond;
 
     std::vector<blink::mojom::BudgetStatePtr> predictions;
     predictions.push_back(std::move(empty_state));
 
     callback.Run(blink::mojom::BudgetServiceErrorType::NONE,
                  std::move(predictions));
@@ skipping 12 matching lines @@
   // BudgetServiceImpl should have been destroyed.
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(render_process_id_);
   DCHECK(host);
 
   // Request a reservation from the BudgetManager.
   content::BrowserContext* context = host->GetBrowserContext();
   BudgetManagerFactory::GetForProfile(context)->Reserve(origin, operation,
                                                         callback);
 }