Enable quiet UI notification prompt phases 3 and 4 in

fieldtrial_testing_config.json. TBR=rayankans@chromium.org Bug: 1180197 Change-Id: I303866ec3572caca3123bcdd4aeefee7d6dd1a46 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2705395 Commit-Queue: Illia Klimov <elklm@chromium.org> Reviewed-by: Jesse Doherty <jwd@chromium.org> Reviewed-by: Balazs Engedy <engedy@chromium.org> Cr-Commit-Position: refs/heads/master@{#856493}
marcosholgado · Feb 22, 2021 · a7f1e32 · a7f1e32
1 parent c50c499
commit a7f1e32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -1690,10 +1690,6 @@ class PushMessagingBrowserTestWithAbusiveOriginPermissionRevocation
 IN_PROC_BROWSER_TEST_F(
     PushMessagingBrowserTestWithAbusiveOriginPermissionRevocation,
     PushEventPermissionRevoked) {
-  AddToPreloadDataBlocklist(https_server()->GetURL("/").GetOrigin(),
-                            SiteReputation::ABUSIVE_CONTENT);
-  AddToSafeBrowsingBlocklist(https_server()->GetURL("/").GetOrigin());
-
   ASSERT_NO_FATAL_FAILURE(SubscribeSuccessfully());
   PushMessagingAppIdentifier app_identifier =
       GetAppIdentifierForServiceWorkerRegistration(0LL);
@@ -1703,6 +1699,11 @@ IN_PROC_BROWSER_TEST_F(
   ASSERT_TRUE(RunScript("isControlled()", &script_result));
   ASSERT_EQ("true - is controlled", script_result);
 
+  // Add an origin to blocking lists after service worker is registered.
+  AddToPreloadDataBlocklist(https_server()->GetURL("/").GetOrigin(),
+                            SiteReputation::ABUSIVE_CONTENT);
+  AddToSafeBrowsingBlocklist(https_server()->GetURL("/").GetOrigin());
+
   gcm::IncomingMessage message;
   message.sender_id = GetTestApplicationServerKey();
   message.raw_data = "testdata";

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
@@ -5819,10 +5819,14 @@
             ],
             "experiments": [
                 {
-                    "name": "EnableWithAdaptiveActivation",
+                    "name": "EnabledWithAdaptiveActivationAndPerSiteInterventions",
                     "params": {
                         "availability": "any",
                         "crowd_deny_hold_back_chance": "0.3",
+                        "enable_abusive_content_triggering": "true",
+                        "enable_abusive_content_warning": "true",
+                        "enable_abusive_request_triggering": "true",
+                        "enable_abusive_request_warning": "true",
                         "enable_adaptive_activation": "true",
                         "enable_crowd_deny_triggering": "true",
                         "event_trigger": "name:tabgroups_dummy;comparator:any;window:1;storage:1",