Skip to content

Commit

Permalink
Remove enterprise policies disabling Chrome Cleanup Tool
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
Daniel Rubery authored and Chromium LUCI CQ committed Sep 7, 2023
1 parent 18af687 commit c14de44
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -21,7 +22,7 @@ owners:
schema:
type: boolean
supported_on:
- chrome.win:68-
- chrome.win:68-118
tags:
- system-security
type: main
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -24,7 +25,7 @@ owners:
schema:
type: boolean
supported_on:
- chrome.win:68-
- chrome.win:68-118
tags:
- system-security
type: main
30 changes: 2 additions & 28 deletions components/policy/test/data/policy_test_cases.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit c14de44

Please sign in to comment.