Added UMA stats to track the budget for any service worker which receives a

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 34 matching lines @@
 using content::BrowserThread;
 using content::NotificationDatabaseData;
 using content::NotificationResources;
 using content::PlatformNotificationContext;
 using content::PlatformNotificationData;
 using content::PushMessagingService;
 using content::ServiceWorkerContext;
 using content::WebContents;
 
 namespace {
-// Currently this just costs 1.0, but we may expand the cost to
-// include things like whether wifi is available in the mobile case.
-const double kBackgroundProcessingCost = 1.0;
-
 void RecordUserVisibleStatus(content::PushUserVisibleStatus status) {
   UMA_HISTOGRAM_ENUMERATION("PushMessaging.UserVisibleStatus", status,
                             content::PUSH_USER_VISIBLE_STATUS_LAST + 1);
 }
 
+void RecordBackgroundBudget(double budget) {

[Peter Beverloo, 2016/05/17 11:04:34]

dito re: inline

[harkness, 2016/05/17 13:08:16]

Done.

+  UMA_HISTOGRAM_COUNTS("PushMessaging.BackgroundBudget", budget);
+}
+
 content::StoragePartition* GetStoragePartition(Profile* profile,
                                                const GURL& origin) {
   return content::BrowserContext::GetStoragePartitionForSite(profile, origin);
 }
 
 NotificationDatabaseData CreateDatabaseData(
     const GURL& origin,
     int64_t service_worker_registration_id) {
   PlatformNotificationData notification_data;
   notification_data.title = url_formatter::FormatUrlForSecurityDisplay(
@@ skipping 108 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 service worker. This will internally record UMA
+  // for budget development work in the future.
+  BackgroundBudgetService* service =
+      BackgroundBudgetServiceFactory::GetForProfile(profile_);
+  double budget = service->GetBudget(origin);
+
+  // Record the budget available any time the budget is queried.
+  RecordBackgroundBudget(budget);
+
   if (notification_needed && !notification_shown) {
-    // Only track budget for messages that needed to show a notification but
-    // did not.
-    BackgroundBudgetService* service =
-        BackgroundBudgetServiceFactory::GetForProfile(profile_);
-    double budget = service->GetBudget(origin);
-    DidGetBudget(origin, service_worker_registration_id,
-                 message_handled_closure, budget);
+    // 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);
     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::DidGetBudget(
+void PushMessagingNotificationManager::CheckForMissedNotification(
     const GURL& origin,
     int64_t service_worker_registration_id,
     const base::Closure& message_handled_closure,
     const double budget) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If the service needed to show a notification but did not, update the
   // budget.
-  if (budget >= kBackgroundProcessingCost) {
+  double backgroundProcessingCost =

[Peter Beverloo, 2016/05/17 11:04:34]

nit: background_processing_cost

[harkness, 2016/05/17 13:08:16]

Done.

+      BackgroundBudgetService::GetBackgroundProcessingCost();
+  if (budget >= backgroundProcessingCost) {
     // Update the stored budget.
     BackgroundBudgetService* service =
         BackgroundBudgetServiceFactory::GetForProfile(profile_);
-    service->StoreBudget(origin, budget - kBackgroundProcessingCost);
+    service->StoreBudget(origin, budget - backgroundProcessingCost);
 
     RecordUserVisibleStatus(
         content::PUSH_USER_VISIBLE_STATUS_REQUIRED_BUT_NOT_SHOWN_USED_GRACE);
     message_handled_closure.Run();
     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 have
-  // already failed once in the previous 10 push messages, so we will show a
-  // generic notification. See https://crbug.com/437277.
+  // The site failed to show a notification when one was needed, and they don't
+  // have enough budget to cover the cost of suppressing, so we will show a
+  // generic notification.
   NotificationDatabaseData database_data =
       CreateDatabaseData(origin, service_worker_registration_id);
   scoped_refptr<PlatformNotificationContext> notification_context =
       GetStoragePartition(profile_, origin)->GetPlatformNotificationContext();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PlatformNotificationContext::WriteNotificationData,
                  notification_context, origin, database_data,
                  base::Bind(&PushMessagingNotificationManager::
                                 DidWriteNotificationDataIOProxy,
@@ skipping 30 matching lines @@
     message_handled_closure.Run();
     return;
   }
 
   PlatformNotificationServiceImpl::GetInstance()->DisplayPersistentNotification(
       profile_, persistent_notification_id, origin, notification_data,
       NotificationResources());
 
   message_handled_closure.Run();
 }