Full hookup of BudgetManager interfaces to BudgetDatabase.

chrome/browser/push_messaging/push_messaging_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
@@ skipping 830 matching lines @@
   EXPECT_EQ("shownotification", script_result);
 
   ASSERT_EQ(1u, notification_manager()->GetNotificationCount());
   {
     const Notification& first_notification =
         notification_manager()->GetNotificationAt(0);
 
     EXPECT_NE(kPushMessagingForcedNotificationTag, first_notification.tag());
   }
 
-  // Check that the UMA has been recorded correctly.
-  // There should be a total of 7 budget samples, spread across 3 buckets. The
-  // first four notifications (before any budget is consumed) have budget of 4,
-  // which is the starting SES. The next one has 2 (one hidden notification) and
-  // the final two have 0 (two hidden notifications.
+  // The BackgroundBudget UMA is recorded when budget is added to the origin.
+  // This happens only once per hour, so there should be a single entry for the
+  // budget.
   std::vector<base::Bucket> buckets =
       GetHistogramTester()->GetAllSamples("PushMessaging.BackgroundBudget");
-  ASSERT_EQ(3.0, buckets.size());
-  // First bucket is for 0 budget, which has 2 samples.
-  EXPECT_EQ(0, buckets[0].min);
-  EXPECT_EQ(2, buckets[0].count);
-  // Second bucket is for 2 budget, which has 1 sample.
-  EXPECT_EQ(2, buckets[1].min);
-  EXPECT_EQ(1, buckets[1].count);
-  // Final bucket is for 4 budget, which has 4 samples.
-  EXPECT_EQ(4, buckets[2].min);
-  EXPECT_EQ(4, buckets[2].count);
+  ASSERT_EQ(1.0, buckets.size());
+  // The bucket is for budget of 4 (the engagement score), which has 1 samples.
+  EXPECT_EQ(4.0, buckets[0].min);
+  EXPECT_EQ(1, buckets[0].count);

[Peter Beverloo, 2016/09/05 14:39:03]

I'm a wee bit hesitant towards testing the implementation details of a UMA
that's recorded in an entirely different directory :-(. Is there some way we
could convert this test to a unit test living in the Budget Service?

[harkness, 2016/09/06 13:28:39]

I added tests in budget_database_unittest.cc and removed these.

 
+  // There should only be 1 entry for NoBudgetOrigin because we only record the
+  // UMA when there needs to be a notification shown and there isn't one.
   std::vector<base::Bucket> no_budget_buckets =
       GetHistogramTester()->GetAllSamples("PushMessaging.SESForNoBudgetOrigin");
   ASSERT_EQ(1.0, no_budget_buckets.size());
   EXPECT_EQ(4, no_budget_buckets[0].min);
-  EXPECT_EQ(2, no_budget_buckets[0].count);
+  EXPECT_EQ(1, no_budget_buckets[0].count);
 
+  // There should also be only 1 entry for LowBudgetOrigin.
   std::vector<base::Bucket> low_budget_buckets =
       GetHistogramTester()->GetAllSamples(
           "PushMessaging.SESForLowBudgetOrigin");
   ASSERT_EQ(1.0, low_budget_buckets.size());
   EXPECT_EQ(4, low_budget_buckets[0].min);
   EXPECT_EQ(1, low_budget_buckets[0].count);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        PushEventAllowSilentPushCommandLineFlag) {
@@ skipping 690 matching lines @@
   ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive());
 
   // After dropping the last subscription background mode is still inactive.
   std::string script_result;
   gcm_service()->AddExpectedUnregisterResponse(gcm::GCMClient::SUCCESS);
   ASSERT_TRUE(RunScript("unsubscribePush()", &script_result));
   EXPECT_EQ("unsubscribe result: true", script_result);
   ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive());
 }
 #endif  // BUILDFLAG(ENABLE_BACKGROUND) && !defined(OS_CHROMEOS)