chromeos: Add delay between screen off and lock.

chrome/browser/chromeos/policy/power_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/power_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index 21cda00719c1200c637eb401578888a7add4c77c..9ee55236dcc2f4777234cf9601fcbf8039e82752 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -69,6 +69,15 @@ void PowerPolicyBrowserTest::SetUserPolicy(
   PolicyMap policy_map;
   policy_map.Set(user_policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                  user_policy_value);
+
+  // The lock-on-idle-suspend policy must be set in order for the
+  // screen-lock-delay policies to be honored.
+  if (user_policy_name == key::kScreenLockDelayAC ||

[Daniel Erat, 2013/05/22 17:12:34]

This feels gross; let me know if you can think of a better approach.

+      user_policy_name == key::kScreenLockDelayBattery) {
+    policy_map.Set(key::kChromeOsLockOnIdleSuspend, POLICY_LEVEL_MANDATORY,
+                   POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
+  }
+
   provider_.UpdateChromePolicy(policy_map);
   base::RunLoop().RunUntilIdle();
 }
@@ -82,6 +91,14 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyBrowserTest, SetPowerPolicy) {
   pm::PowerManagementPolicy original_power_management_policy =
       power_manager_client_->get_policy();
 
+  // Also save the default policy that's sent when the lock-on-idle-suspend
+  // policy is enabled, as it results in a different interpretation of the
+  // screen-lock-delay policies.
+  SetUserPolicy(key::kChromeOsLockOnIdleSuspend,
+                base::Value::CreateBooleanValue(true));
+  pm::PowerManagementPolicy original_power_management_screen_lock_policy =
+      power_manager_client_->get_policy();
+
   pm::PowerManagementPolicy power_management_policy =
       original_power_management_policy;
   power_management_policy.set_idle_action(
@@ -126,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyBrowserTest, SetPowerPolicy) {
   EXPECT_EQ(GetDebugString(power_management_policy),
             GetDebugString(power_manager_client_->get_policy()));
 
-  power_management_policy = original_power_management_policy;
+  power_management_policy = original_power_management_screen_lock_policy;
   power_management_policy.mutable_ac_delays()->set_screen_lock_ms(6000);
   SetUserPolicy(key::kScreenLockDelayAC, base::Value::CreateIntegerValue(6000));
   EXPECT_EQ(GetDebugString(power_management_policy),
@@ -159,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyBrowserTest, SetPowerPolicy) {
   EXPECT_EQ(GetDebugString(power_management_policy),
             GetDebugString(power_manager_client_->get_policy()));
 
-  power_management_policy = original_power_management_policy;
+  power_management_policy = original_power_management_screen_lock_policy;
   power_management_policy.mutable_battery_delays()->set_screen_lock_ms(2000);
   SetUserPolicy(key::kScreenLockDelayBattery,
                 base::Value::CreateIntegerValue(2000));