[Merge to M77] Flip feature kCrostiniAdditionalEnterpriseReporting to enabled by default
This flips the feature for additional Crostini enterprise reporting
to enabled by default after privacy and test approvals.
(cherry picked from commit fc6f6e0839ecad51d53013d325c5593686a711c5)
Bug: 844468
Test: browser_tests --gtest_filter="DeviceStatusCollectorTest.*Crostini*"
Change-Id: I13aee59df3ff2709ffb422517be253723857cbd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1737329
Auto-Submit: Alex Oldemeier <[email protected]>
Reviewed-by: Denis Kuznetsov <[email protected]>
Commit-Queue: Alex Oldemeier <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#684743}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742237
Reviewed-by: Alex Oldemeier <[email protected]>
Cr-Commit-Position: refs/branch-heads/3865@{#306}
Cr-Branched-From: 0cdcc6158160790658d1f033d3db873603250124-refs/heads/master@{#681094}
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
index 40d52cf..92857cff 100644
--- a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
@@ -1617,22 +1617,20 @@
crostini::prefs::kCrostiniLastLaunchTerminaKernelVersion,
kTerminaVmKernelVersion);
- // Check that nothing is reported when the feature flag is not enabled:
+ // Check that the kernel version is reported as to the feature flag default:
+ GetStatus();
+ EXPECT_TRUE(got_session_status_);
+ EXPECT_EQ(kTerminaVmKernelVersion,
+ session_status_.crostini_status().last_launch_vm_kernel_version());
+
+ // Check that nothing is reported when the feature flag is disabled:
+ scoped_feature_list_.InitAndDisableFeature(
+ features::kCrostiniAdditionalEnterpriseReporting);
GetStatus();
EXPECT_TRUE(got_session_status_);
EXPECT_TRUE(session_status_.crostini_status()
.last_launch_vm_kernel_version()
.empty());
-
- scoped_feature_list_.InitAndEnableFeature(
- features::kCrostiniAdditionalEnterpriseReporting);
-
- // Check that the kernel version is reported now that the feature flag is
- // enabled:
- GetStatus();
- EXPECT_TRUE(got_session_status_);
- EXPECT_EQ(kTerminaVmKernelVersion,
- session_status_.crostini_status().last_launch_vm_kernel_version());
}
TEST_F(DeviceStatusCollectorTest, CrostiniAppUsageReporting) {
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index bcd14c5..4f880eb1 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -182,7 +182,7 @@
// Enable additional Crostini session status reporting for
// managed devices only, i.e. reports of installed apps and kernel version.
const base::Feature kCrostiniAdditionalEnterpriseReporting{
- "CrostiniAdditionalEnterpriseReporting", base::FEATURE_DISABLED_BY_DEFAULT};
+ "CrostiniAdditionalEnterpriseReporting", base::FEATURE_ENABLED_BY_DEFAULT};
// Enable advanced access controls for Crostini-related features
// (e.g. restricting VM CLI tools access, restricting Crostini root access).
