Commit 1c80f902 authored by Mattias Nissler's avatar Mattias Nissler Committed by Commit Bot

Change Chrome OS SchedulerConfiguration default to conservative.

BUG=chromium:927840
TEST=Manual

Change-Id: I2911433cf2b69b4ef5c658194d8c1f13d0a53c0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611610Reviewed-by: default avatarGreg Kerr <kerrnel@chromium.org>
Reviewed-by: default avatarDan Erat <derat@chromium.org>
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659511}
parent 010f4e81
...@@ -77,7 +77,7 @@ void SchedulerConfigurationManager::OnPrefChange() { ...@@ -77,7 +77,7 @@ void SchedulerConfigurationManager::OnPrefChange() {
} else if (!feature_param_value.empty()) { } else if (!feature_param_value.empty()) {
config_name = feature_param_value; config_name = feature_param_value;
} else { } else {
config_name = debugd::scheduler_configuration::kPerformanceScheduler; config_name = debugd::scheduler_configuration::kConservativeScheduler;
} }
// NB: Also send an update when the config gets reset to let the system pick // NB: Also send an update when the config gets reset to let the system pick
......
...@@ -54,7 +54,7 @@ TEST_F(SchedulerConfigurationManagerTest, ConfigChange) { ...@@ -54,7 +54,7 @@ TEST_F(SchedulerConfigurationManagerTest, ConfigChange) {
// Correct default is used when there is no configured value. // Correct default is used when there is no configured value.
SchedulerConfigurationManager manager(&debug_daemon_client_, &local_state_); SchedulerConfigurationManager manager(&debug_daemon_client_, &local_state_);
scoped_task_environment_.RunUntilIdle(); scoped_task_environment_.RunUntilIdle();
EXPECT_EQ(debugd::scheduler_configuration::kPerformanceScheduler, EXPECT_EQ(debugd::scheduler_configuration::kConservativeScheduler,
debug_daemon_client_.scheduler_configuration_name()); debug_daemon_client_.scheduler_configuration_name());
// Change user pref, which should trigger a config change. // Change user pref, which should trigger a config change.
...@@ -77,7 +77,7 @@ TEST_F(SchedulerConfigurationManagerTest, ConfigChange) { ...@@ -77,7 +77,7 @@ TEST_F(SchedulerConfigurationManagerTest, ConfigChange) {
// Dropping the policy as well reverts to the default configuration. // Dropping the policy as well reverts to the default configuration.
local_state_.RemoveManagedPref(prefs::kSchedulerConfiguration); local_state_.RemoveManagedPref(prefs::kSchedulerConfiguration);
scoped_task_environment_.RunUntilIdle(); scoped_task_environment_.RunUntilIdle();
EXPECT_EQ(debugd::scheduler_configuration::kPerformanceScheduler, EXPECT_EQ(debugd::scheduler_configuration::kConservativeScheduler,
debug_daemon_client_.scheduler_configuration_name()); debug_daemon_client_.scheduler_configuration_name());
} }
......
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