0

Enable Kiosk Heartbeats via ERP by default.

The feature is rolling out via finch in M126+ and should be enabled by default.

launch bug: http://launch/4309900

Change-Id: Ica103bab0d740fc18c1bf843142a4eeb040db68c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5953653
Reviewed-by: Oleg Davydov <burunduk@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Florian Zubeil <zubeil@google.com>
Cr-Commit-Position: refs/heads/main@{#1373320}
This commit is contained in:
Florian Zubeil
2024-10-24 14:58:47 +00:00
committed by Chromium LUCI CQ
parent 1456728fcc
commit 9e8002e662
4 changed files with 21 additions and 8 deletions
chrome/browser/ash/policy
chromeos/constants
testing/variations

@ -982,15 +982,16 @@ TEST_P(DeviceCloudPolicyManagerAshEnrollmentTest, Success) {
TEST_P(DeviceCloudPolicyManagerAshEnrollmentTest,
EnabledKioskHeartbeatsViaERP) {
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(chromeos::features::kKioskHeartbeatsViaERP);
RunTest();
EXPECT_FALSE(manager_->GetHeartbeatSchedulerForTesting());
}
TEST_P(DeviceCloudPolicyManagerAshEnrollmentTest,
DisabledKioskHeartbeatsViaERP) {
base::test::ScopedFeatureList feature_list;
feature_list.InitAndDisableFeature(
chromeos::features::kKioskHeartbeatsViaERP);
RunTest();
EXPECT_EQ(manager_->GetHeartbeatSchedulerForTesting()->last_heartbeat(),
base::Time());

@ -1196,6 +1196,10 @@ class KioskHeartbeatTelemetryTest : public MetricReportingManagerTest {
};
TEST_F(KioskHeartbeatTelemetryTest, Disabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(
chromeos::features::kKioskHeartbeatsViaERP);
auto* const mock_delegate_ptr = mock_delegate_.get();
auto metric_reporting_manager = MetricReportingManager::CreateForTesting(
std::move(mock_delegate_), nullptr);
@ -1232,10 +1236,6 @@ TEST_F(KioskHeartbeatTelemetryTest, Disabled) {
}
TEST_F(KioskHeartbeatTelemetryTest, Init) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndEnableFeature(
chromeos::features::kKioskHeartbeatsViaERP);
auto* const mock_delegate_ptr = mock_delegate_.get();
auto metric_reporting_manager = MetricReportingManager::CreateForTesting(
std::move(mock_delegate_), nullptr);
@ -1470,6 +1470,12 @@ class EventDrivenTelemetryCollectorPoolTest
TEST_P(EventDrivenTelemetryCollectorPoolTest,
SettingBasedTelemetry_AffiliatedOnly) {
// TODO(crbug.com/375383880): Temporarily disable kKioskHeartbeatsViaERP as
// this test assumes that CreatePeriodicUploadReportQueue is only called once.
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(
chromeos::features::kKioskHeartbeatsViaERP);
EventDrivenTelemetryCollectorPoolTestCase test_case = GetParam();
base::Value::List telemetry_list;

@ -157,7 +157,7 @@ BASE_FEATURE(kJellyroll, "Jellyroll", base::FEATURE_ENABLED_BY_DEFAULT);
// Enables Kiosk Heartbeats to be sent via Encrypted Reporting Pipeline
BASE_FEATURE(kKioskHeartbeatsViaERP,
"KioskHeartbeatsViaERP",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
// Controls enabling / disabling the mahi feature.
BASE_FEATURE(kMahi, "Mahi", base::FEATURE_ENABLED_BY_DEFAULT);

@ -12917,6 +12917,12 @@
"enable_features": [
"KioskHeartbeatsViaERP"
]
},
{
"name": "Disabled",
"disable_features": [
"KioskHeartbeatsViaERP"
]
}
]
}