chromeos: Add delay between screen off and lock.

chromeos/dbus/power_policy_controller_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/power_policy_controller.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
@@ skipping 42 matching lines @@
   prefs.use_audio_activity = true;
   prefs.use_video_activity = true;
   prefs.enable_screen_lock = false;
   prefs.presentation_idle_delay_factor = 3.0;
   prefs.user_activity_screen_dim_delay_factor = 2.0;
   policy_controller_->ApplyPrefs(prefs);
 
   power_manager::PowerManagementPolicy expected_policy;
   expected_policy.mutable_ac_delays()->set_screen_dim_ms(600000);
   expected_policy.mutable_ac_delays()->set_screen_off_ms(660000);
-  expected_policy.mutable_ac_delays()->set_screen_lock_ms(-1);
+  expected_policy.mutable_ac_delays()->set_screen_lock_ms(0);
   expected_policy.mutable_ac_delays()->set_idle_warning_ms(-1);
   expected_policy.mutable_ac_delays()->set_idle_ms(720000);
   expected_policy.mutable_battery_delays()->set_screen_dim_ms(300000);
   expected_policy.mutable_battery_delays()->set_screen_off_ms(360000);
-  expected_policy.mutable_battery_delays()->set_screen_lock_ms(-1);
+  expected_policy.mutable_battery_delays()->set_screen_lock_ms(0);
   expected_policy.mutable_battery_delays()->set_idle_warning_ms(-1);
   expected_policy.mutable_battery_delays()->set_idle_ms(420000);
   expected_policy.set_idle_action(
       power_manager::PowerManagementPolicy_Action_SUSPEND);
   expected_policy.set_lid_closed_action(
       power_manager::PowerManagementPolicy_Action_SHUT_DOWN);
   expected_policy.set_use_audio_activity(true);
   expected_policy.set_use_video_activity(true);
   expected_policy.set_presentation_idle_delay_factor(3.0);
   expected_policy.set_user_activity_screen_dim_delay_factor(2.0);
   expected_policy.set_reason("Prefs");
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
   // Change some prefs and check that an updated policy is sent.
   prefs.ac_idle_warning_delay_ms = 700000;
   prefs.battery_idle_warning_delay_ms = 400000;
   prefs.lid_closed_action = PowerPolicyController::ACTION_SUSPEND;
   policy_controller_->ApplyPrefs(prefs);
   expected_policy.mutable_ac_delays()->set_idle_warning_ms(700000);
   expected_policy.mutable_battery_delays()->set_idle_warning_ms(400000);
   expected_policy.set_lid_closed_action(
       power_manager::PowerManagementPolicy_Action_SUSPEND);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
-  // The enable-screen-lock pref should force the screen-lock delays to
-  // match the screen-off delays.
-  prefs.enable_screen_lock = true;
+  // Screen lock delays should be ignored if the enable-screen-lock pref is
+  // false.
+  prefs.ac_screen_lock_delay_ms = 670000;
+  prefs.battery_screen_lock_delay_ms = 370000;
   policy_controller_->ApplyPrefs(prefs);
-  expected_policy.mutable_ac_delays()->set_screen_lock_ms(660000);
-  expected_policy.mutable_battery_delays()->set_screen_lock_ms(360000);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
-  // If the screen-lock-delay prefs are set to lower values than the
-  // screen-off delays, the lock prefs should take precedence.
-  prefs.ac_screen_lock_delay_ms = 70000;
-  prefs.battery_screen_lock_delay_ms = 60000;
+  // After setting the enable-screen-lock pref, the lock delays should be sent.
+  prefs.enable_screen_lock = true;
   policy_controller_->ApplyPrefs(prefs);
-  expected_policy.mutable_ac_delays()->set_screen_lock_ms(70000);
-  expected_policy.mutable_battery_delays()->set_screen_lock_ms(60000);
+  expected_policy.mutable_ac_delays()->set_screen_lock_ms(670000);
+  expected_policy.mutable_battery_delays()->set_screen_lock_ms(370000);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
   // Set the "allow screen wake locks" pref to false.  The system should be
   // prevented from suspending due to user inactivity but the pref-supplied
   // screen-related delays should be left untouched.
   prefs.allow_screen_wake_locks = false;
   policy_controller_->ApplyPrefs(prefs);
   policy_controller_->AddScreenWakeLock("Screen");
   expected_policy.set_idle_action(
       power_manager::PowerManagementPolicy_Action_DO_NOTHING);
   expected_policy.set_reason("Prefs, Screen");
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
+
+  // Allow screen wake locks and check that the screen-related delays from
+  // the prefs are overridden.
+  prefs.allow_screen_wake_locks = true;
+  policy_controller_->ApplyPrefs(prefs);
+  expected_policy.mutable_ac_delays()->set_screen_dim_ms(0);
+  expected_policy.mutable_ac_delays()->set_screen_off_ms(0);
+  expected_policy.mutable_ac_delays()->set_screen_lock_ms(0);
+  expected_policy.mutable_battery_delays()->set_screen_dim_ms(0);
+  expected_policy.mutable_battery_delays()->set_screen_off_ms(0);
+  expected_policy.mutable_battery_delays()->set_screen_lock_ms(0);
+  EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
+            PowerPolicyController::GetPolicyDebugString(
+                fake_power_client_.get_policy()));
 }
 
 TEST_F(PowerPolicyControllerTest, WakeLocks) {
   const char kSystemWakeLockReason[] = "system";
   const int system_id =
       policy_controller_->AddSystemWakeLock(kSystemWakeLockReason);
   power_manager::PowerManagementPolicy expected_policy;
   expected_policy.set_idle_action(
       power_manager::PowerManagementPolicy_Action_DO_NOTHING);
   expected_policy.set_reason(kSystemWakeLockReason);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
   const char kScreenWakeLockReason[] = "screen";
   const int screen_id = policy_controller_->AddScreenWakeLock(
       kScreenWakeLockReason);
   expected_policy.mutable_ac_delays()->set_screen_dim_ms(0);
   expected_policy.mutable_ac_delays()->set_screen_off_ms(0);
+  expected_policy.mutable_ac_delays()->set_screen_lock_ms(0);
   expected_policy.mutable_battery_delays()->set_screen_dim_ms(0);
   expected_policy.mutable_battery_delays()->set_screen_off_ms(0);
+  expected_policy.mutable_battery_delays()->set_screen_lock_ms(0);
   expected_policy.set_reason(
       std::string(kScreenWakeLockReason) + ", " + kSystemWakeLockReason);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
   policy_controller_->RemoveWakeLock(system_id);
   expected_policy.set_reason(kScreenWakeLockReason);
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 
   policy_controller_->RemoveWakeLock(screen_id);
   expected_policy.Clear();
   EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(expected_policy),
             PowerPolicyController::GetPolicyDebugString(
                 fake_power_client_.get_policy()));
 }
 
 }  // namespace chromeos