Replace the 1 in 10 grace period with an accumulating budget based on SES.

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>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/notifications/message_center_display_service.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
 #include "chrome/browser/push_messaging/push_messaging_constants.h"
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
@@ skipping 197 matching lines @@
     return notification_manager_.get();
   }
 
   PlatformNotificationServiceImpl* notification_service() const {
     return PlatformNotificationServiceImpl::GetInstance();
   }
 #endif
 
   PushMessagingServiceImpl* push_service() const { return push_service_; }
 
+  void SetSiteEngagementScore(const GURL& url, double score) {
+    SiteEngagementService* service =
+        SiteEngagementService::Get(GetBrowser()->profile());
+    service->ResetScoreForURL(url, score);
+  }
+
  protected:
   virtual std::string GetTestURL() { return "/push_messaging/test.html"; }
 
   virtual Browser* GetBrowser() const { return browser(); }
 
  private:
   std::unique_ptr<net::EmbeddedTestServer> https_server_;
   gcm::FakeGCMProfileService* gcm_service_;
   PushMessagingServiceImpl* push_service_;
 
@@ skipping 491 matching lines @@
     ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result));
     EXPECT_EQ("testdata", script_result);
     EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
   }
 
   // Open a blank foreground tab so site is no longer visible.
   ui_test_utils::NavigateToURLWithDisposition(
       GetBrowser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
+  // Set the site engagement score for the site. Setting it to 3 means we should
+  // have enough budget for three non-shown notification.
+  SetSiteEngagementScore(web_contents->GetURL(), 2.0);

[Peter Beverloo, 2016/05/04 15:41:52]

"Setting it to 3 means..."  "...->GetURL(), 2.0);"

You say three, but use two?

[harkness, 2016/05/09 15:33:27]

oops, comment update fail.

+
+  // If the Service Worker push event handler shows a notification, we
+  // should not show a forced one.
+  message.raw_data = "shownotification";
+  SendMessageAndWaitUntilHandled(app_identifier, message);
+  ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
+  EXPECT_EQ("shownotification", script_result);
+  EXPECT_EQ(1u, notification_manager()->GetNotificationCount());
+  EXPECT_EQ("push_test_tag",
+            notification_manager()->GetNotificationAt(0).tag());
+  notification_manager()->CancelAll();
+
   // If the Service Worker push event handler does not show a notification, we
-  // should show a forced one, but only on the 2nd occurrence since we allow one
-  // mistake per 10 push events.
+  // should show a forced one, but only once the origin is out of budget.
+  message.raw_data = "testdata";
+  for (int n = 0; n < 2; n++) {
+    // First two missed notifications shouldn't force a default one.
+    SendMessageAndWaitUntilHandled(app_identifier, message);
+    ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
+    EXPECT_EQ("testdata", script_result);
+    EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
+  }
+
+  // Third missed notification should trigger a default notification, since the
+  // origin will be out of budget.
   message.raw_data = "testdata";
   SendMessageAndWaitUntilHandled(app_identifier, message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
-  EXPECT_EQ("testdata", script_result);
-  EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
-  message.raw_data = "testdata";
-  SendMessageAndWaitUntilHandled(app_identifier, message);
-  ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   EXPECT_EQ("testdata", script_result);
 
   ASSERT_EQ(1u, notification_manager()->GetNotificationCount());
   {
     const Notification& forced_notification =
         notification_manager()->GetNotificationAt(0);
 
     EXPECT_EQ(kPushMessagingForcedNotificationTag, forced_notification.tag());
     EXPECT_TRUE(forced_notification.silent());
   }
 
   // The notification will be automatically dismissed when the developer shows
   // a new notification themselves at a later point in time.
   message.raw_data = "shownotification";
   SendMessageAndWaitUntilHandled(app_identifier, message);
   ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
   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());
   }
-
-  notification_manager()->CancelAll();
-  EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
-
-  // However if the Service Worker push event handler shows a notification, we
-  // should not show a forced one.
-  message.raw_data = "shownotification";
-  for (int n = 0; n < 9; n++) {
-    SendMessageAndWaitUntilHandled(app_identifier, message);
-    ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
-    EXPECT_EQ("shownotification", script_result);
-    EXPECT_EQ(1u, notification_manager()->GetNotificationCount());
-    EXPECT_EQ("push_test_tag",
-              notification_manager()->GetNotificationAt(0).tag());
-    notification_manager()->CancelAll();
-  }
-
-  // Now that 10 push messages in a row have shown notifications, we should
-  // allow the next one to mistakenly not show a notification.
-  message.raw_data = "testdata";
-  SendMessageAndWaitUntilHandled(app_identifier, message);
-  ASSERT_TRUE(RunScript("resultQueue.pop()", &script_result, web_contents));
-  EXPECT_EQ("testdata", script_result);
-  EXPECT_EQ(0u, notification_manager()->GetNotificationCount());
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        PushEventEnforcesUserVisibleNotificationAfterQueue) {
   std::string script_result;
 
   TryToSubscribeSuccessfully("1-0" /* expected_push_subscription_id */);
 
   PushMessagingAppIdentifier app_identifier =
       GetAppIdentifierForServiceWorkerRegistration(0LL);
@@ skipping 632 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)