Commit 27ec06e3 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Remove UsageTimeLimitPolicy feature flag

The feature is enabled since July 2018.

Bug: 1013650
Change-Id: I23fdbb2a15ec68c6fc7f975c1d800dacb85ca5ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857197Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706198}
parent 5940df71
...@@ -219,8 +219,7 @@ void ChildStatusCollector::UpdateReportingSettings() { ...@@ -219,8 +219,7 @@ void ChildStatusCollector::UpdateReportingSettings() {
} }
// Activity times. // Activity times.
report_activity_times_ = report_activity_times_ = true;
base::FeatureList::IsEnabled(features::kUsageTimeLimitPolicy);
// Settings related. // Settings related.
report_version_info_ = true; report_version_info_ = true;
......
...@@ -1586,13 +1586,11 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( ...@@ -1586,13 +1586,11 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
prefs::kNoteTakingAppsLockScreenWhitelist, false /*allow_wildcards*/)); prefs::kNoteTakingAppsLockScreenWhitelist, false /*allow_wildcards*/));
handlers->AddHandler( handlers->AddHandler(
std::make_unique<SecondaryGoogleAccountSigninPolicyHandler>()); std::make_unique<SecondaryGoogleAccountSigninPolicyHandler>());
if (base::FeatureList::IsEnabled(features::kUsageTimeLimitPolicy)) { handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>(
handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( key::kUsageTimeLimit, prefs::kUsageTimeLimit, chrome_schema,
key::kUsageTimeLimit, prefs::kUsageTimeLimit, chrome_schema, SCHEMA_ALLOW_UNKNOWN,
SCHEMA_ALLOW_UNKNOWN, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
}
handlers->AddHandler(std::make_unique<ArcServicePolicyHandler>( handlers->AddHandler(std::make_unique<ArcServicePolicyHandler>(
key::kArcBackupRestoreServiceEnabled, key::kArcBackupRestoreServiceEnabled,
arc::prefs::kArcBackupRestoreEnabled)); arc::prefs::kArcBackupRestoreEnabled));
......
...@@ -223,10 +223,6 @@ const base::Feature kCupsPrintersUiOverhaul{"CupsPrintersUiOverhaul", ...@@ -223,10 +223,6 @@ const base::Feature kCupsPrintersUiOverhaul{"CupsPrintersUiOverhaul",
// Enable support for "Plugin VMs" on Chrome OS. // Enable support for "Plugin VMs" on Chrome OS.
const base::Feature kPluginVm{"PluginVm", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kPluginVm{"PluginVm", base::FEATURE_DISABLED_BY_DEFAULT};
// Whether the UsageTimeLimit policy should be applied to the user.
const base::Feature kUsageTimeLimitPolicy{"UsageTimeLimitPolicy",
base::FEATURE_ENABLED_BY_DEFAULT};
// Allow a Wilco DTC (diagnostics and telemetry controller) on Chrome OS. // Allow a Wilco DTC (diagnostics and telemetry controller) on Chrome OS.
// More info about the project may be found here: // More info about the project may be found here:
// https://docs.google.com/document/d/18Ijj8YlC8Q3EWRzLspIi2dGxg4vIBVe5sJgMPt9SWYo // https://docs.google.com/document/d/18Ijj8YlC8Q3EWRzLspIi2dGxg4vIBVe5sJgMPt9SWYo
......
...@@ -132,8 +132,6 @@ extern const base::Feature kCrostiniForceClose; ...@@ -132,8 +132,6 @@ extern const base::Feature kCrostiniForceClose;
COMPONENT_EXPORT(CHROME_FEATURES) COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kCupsPrintersUiOverhaul; extern const base::Feature kCupsPrintersUiOverhaul;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kPluginVm; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kPluginVm;
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kUsageTimeLimitPolicy;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kWilcoDtc; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kWilcoDtc;
COMPONENT_EXPORT(CHROME_FEATURES) COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kUploadZippedSystemLogs; extern const base::Feature kUploadZippedSystemLogs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment