0

Remove enterprise policies disabling Chrome Cleanup Tool

The Chrome Cleanup Tool is no longer running in Chrome (since M112). So
we no longer need this policy. While the code has been disabled for
several milestones, we delete the remaining code in a dependent CL.

Bug: 1439998
Change-Id: I8582c44ca6906e7c3605a288404c404e050fb7d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4834768
Reviewed-by: Roland Bock <rbock@google.com>
Reviewed-by: Roman Sorokin <rsorokin@google.com>
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1193633}
This commit is contained in:
Daniel Rubery
2023-09-07 16:39:28 +00:00
committed by Chromium LUCI CQ
parent 18af687d0b
commit c14de4452b
5 changed files with 6 additions and 52 deletions
chrome/browser
components/policy
resources
templates
test

@@ -1542,12 +1542,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
{ key::kApplicationLocaleValue,
language::prefs::kApplicationLocale,
base::Value::Type::STRING },
{ key::kChromeCleanupEnabled,
prefs::kSwReporterEnabled,
base::Value::Type::BOOLEAN },
{ key::kChromeCleanupReportingEnabled,
prefs::kSwReporterReportingEnabled,
base::Value::Type::BOOLEAN },
{ key::kRendererCodeIntegrityEnabled,
prefs::kRendererCodeIntegrityEnabled,
base::Value::Type::BOOLEAN },

@@ -869,20 +869,4 @@ INSTANTIATE_TEST_SUITE_P(
::testing::Values(PolicyState::kNoLogs)),
ReporterRunTestParamsToString());
// Tests with enterprise policies forcing reporting to be either enabled
// or disabled.
INSTANTIATE_TEST_SUITE_P(
EnterprisePolicy,
ReporterRunnerTest,
::testing::Combine(
::testing::Values(
SwReporterInvocationType::kPeriodicRun,
SwReporterInvocationType::kUserInitiatedWithLogsDisallowed,
SwReporterInvocationType::kUserInitiatedWithLogsAllowed),
::testing::Values("Seed1"), // old_seed_
::testing::Values("Seed2"), // incoming_seed_
::testing::Values(PolicyState::kLogsForceEnable,
PolicyState::kLogsForceDisable)),
ReporterRunTestParamsToString());
} // namespace safe_browsing

@@ -1,5 +1,6 @@
caption: Enable Chrome Cleanup on Windows
default: true
deprecated: true
desc: |-
Setting the policy to Enabled or leaving it unset means Chrome Cleanup periodically scans the system for unwanted software and should any be found, will ask the user if they wish to remove it. Manually triggering Chrome Cleanup from chrome://settings is allowed.
@@ -21,7 +22,7 @@ owners:
schema:
type: boolean
supported_on:
- chrome.win:68-
- chrome.win:68-118
tags:
- system-security
type: main

@@ -1,5 +1,6 @@
caption: Control how Chrome Cleanup reports data to Google
default: null
deprecated: true
desc: |-
Setting the policy to Enabled means if <ph name="CHROME_CLEANUP_NAME">Chrome Cleanup</ph> detects unwanted software, it may, in line with policy set by <ph name="SAFE_BROWSING_EXTENDED_REPORTING_ENABLED_POLICY_NAME">SafeBrowsingExtendedReportingEnabled</ph>, report about the scan to Google. <ph name="CHROME_CLEANUP_NAME">Chrome Cleanup</ph> asks users if they want the cleanup. It sends results to Google.
@@ -24,7 +25,7 @@ owners:
schema:
type: boolean
supported_on:
- chrome.win:68-
- chrome.win:68-118
tags:
- system-security
type: main

@@ -15477,36 +15477,10 @@
"reason_for_missing_test": "Maps into CrosSettings"
},
"ChromeCleanupEnabled": {
"os": [
"win"
],
"policy_pref_mapping_tests": [
{
"policies": {
"ChromeCleanupEnabled": true
},
"prefs": {
"software_reporter.enabled": {
"location": "local_state"
}
}
}
]
"reason_for_missing_test": "Policy was removed"
},
"ChromeCleanupReportingEnabled": {
"os": [
"win"
],
"policy_pref_mapping_tests": [
{
"policies": {
"ChromeCleanupReportingEnabled": false
},
"prefs": {
"software_reporter.reporting": {}
}
}
]
"reason_for_missing_test": "Policy was removed"
},
"SafeBrowsingWhitelistDomains": {
"reason_for_missing_test": "Policy was removed"