Full hookup of BudgetManager interfaces to BudgetDatabase.

chrome/browser/push_messaging/push_messaging_notification_manager.cc

 // Copyright 2015 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_notification_manager.h"
 
 #include <stddef.h>
 
 #include <bitset>
 
@@ skipping 169 matching lines @@
       platform_notification_service->ClosePersistentNotification(
           profile_, notification_database_data.notification_id);
       platform_notification_service->OnPersistentNotificationClose(
           profile_, notification_database_data.notification_id,
           notification_database_data.origin, false /* by_user */);
 
       break;
     }
   }
 
-  // Get the budget for the origin.
-  BudgetManager* manager = BudgetManagerFactory::GetForProfile(profile_);
-  manager->GetBudget(
-      origin,
-      base::Bind(&PushMessagingNotificationManager::DidGetBudget,
-                 weak_factory_.GetWeakPtr(), origin,
-                 service_worker_registration_id, message_handled_closure,
-                 notification_needed, notification_shown));
-}
-
-void PushMessagingNotificationManager::DidGetBudget(
-    const GURL& origin,
-    int64_t service_worker_registration_id,
-    const base::Closure& message_handled_closure,
-    bool notification_needed,
-    bool notification_shown,
-    const double budget) {
-  // Record the budget available any time the budget is queried.
-  UMA_HISTOGRAM_COUNTS_100("PushMessaging.BackgroundBudget", budget);
-
-  // Get the site engagement score. Only used for UMA recording.
-  SiteEngagementService* ses_service = SiteEngagementService::Get(profile_);
-  double ses_score = ses_service->GetScore(origin);
-
-  // Generate histograms for the GetBudget calls which would return "no budget"
-  // or "low budget" if an API was available to app developers.
-  double cost =
-      BudgetManager::GetCost(blink::mojom::BudgetOperationType::SILENT_PUSH);
-  if (budget < cost)
-    UMA_HISTOGRAM_COUNTS_100("PushMessaging.SESForNoBudgetOrigin", ses_score);
-  else if (budget < 2.0 * cost)
-    UMA_HISTOGRAM_COUNTS_100("PushMessaging.SESForLowBudgetOrigin", ses_score);
-
   if (notification_needed && !notification_shown) {
-    // If the worker needed to show a notification and didn't, check the budget
-    // and take appropriate action.
-    CheckForMissedNotification(origin, service_worker_registration_id,
-                               message_handled_closure, budget);
+    // If the worker needed to show a notification and didn't, see if a silent
+    // push was allowed.
+    BudgetManager* manager = BudgetManagerFactory::GetForProfile(profile_);
+    BudgetManager::ConsumeCallback consumeCallback =

[Peter Beverloo, 2016/08/26 14:56:44]

nit: I wouldn't use the local here. Up to you.

[harkness, 2016/08/31 13:15:35]

Done.

+        base::Bind(&PushMessagingNotificationManager::ProcessSilentPush,
+                   weak_factory_.GetWeakPtr(), origin,
+                   service_worker_registration_id, message_handled_closure);
+    manager->Consume(origin, blink::mojom::BudgetOperationType::SILENT_PUSH,
+                     consumeCallback);
     return;
   }
 
   if (notification_needed && notification_shown) {
     RecordUserVisibleStatus(
         content::PUSH_USER_VISIBLE_STATUS_REQUIRED_AND_SHOWN);
   } else if (!notification_needed && !notification_shown) {
     RecordUserVisibleStatus(
         content::PUSH_USER_VISIBLE_STATUS_NOT_REQUIRED_AND_NOT_SHOWN);
   } else {
@@ skipping 30 matching lines @@
 
   // view-source: pages are considered to be controlled Service Worker clients
   // and thus should be considered when checking the visible URL. However, the
   // prefix has to be removed before the origins can be compared.
   if (visible_url.SchemeIs(content::kViewSourceScheme))
     visible_url = GURL(visible_url.GetContent());
 
   return visible_url.GetOrigin() == origin;
 }
 
-void PushMessagingNotificationManager::CheckForMissedNotification(
+void PushMessagingNotificationManager::ProcessSilentPush(
     const GURL& origin,
     int64_t service_worker_registration_id,
     const base::Closure& message_handled_closure,
-    const double budget) {
+    bool silent_push_allowed) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // If the service needed to show a notification but did not, update the
-  // budget.
-  double cost =
-      BudgetManager::GetCost(blink::mojom::BudgetOperationType::SILENT_PUSH);
-  if (budget >= cost) {
+  // If the service was allowed to issue a silent push, just return.
+  if (silent_push_allowed) {
     RecordUserVisibleStatus(
         content::PUSH_USER_VISIBLE_STATUS_REQUIRED_BUT_NOT_SHOWN_USED_GRACE);
-
-    BudgetManager* manager = BudgetManagerFactory::GetForProfile(profile_);
-    // Update the stored budget.
-    manager->StoreBudget(origin, budget - cost, message_handled_closure);
-
     return;
   }
 
   RecordUserVisibleStatus(
       content::PUSH_USER_VISIBLE_STATUS_REQUIRED_BUT_NOT_SHOWN_GRACE_EXCEEDED);
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(),
       "PushMessaging.GenericNotificationShown.Origin", origin);
 
   // The site failed to show a notification when one was needed, and they don't
@@ skipping 46 matching lines @@
   // Do not pass service worker scope. The origin will be used instead of the
   // service worker scope to determine whether a notification should be
   // attributed to a WebAPK on Android. This is OK because this code path is hit
   // rarely.
   PlatformNotificationServiceImpl::GetInstance()->DisplayPersistentNotification(
       profile_, persistent_notification_id, GURL() /* service_worker_scope */,
       origin, notification_data, NotificationResources());
 
   message_handled_closure.Run();
 }