chromeos: Replace scale-delays-for-presentation-mode pref.

This replaces the kPowerPresentationIdleDelayFactor pref
with kPowerPresentationScreenDimDelayFactor. The former
scaled the idle delay and then adjusted the other delays;
the latter scales the screen-dim delay before adjusting
other delays.

It also updates the cros_system_api dependency to d2d441c1.

BUG=chromium:248276

Review URL: https://chromiumcodereview.appspot.com/16677007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205905 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 10 deletions

diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc
index 0485686..9ad9130 100644
--- a/chromeos/dbus/power_policy_controller.cc
+++ b/chromeos/dbus/power_policy_controller.cc
@@ -82,7 +82,7 @@ PowerPolicyController::PrefValues::PrefValues()
       use_video_activity(true),
       allow_screen_wake_locks(true),
       enable_screen_lock(false),
-      presentation_idle_delay_factor(2.0),
+      presentation_screen_dim_delay_factor(1.0),
       user_activity_screen_dim_delay_factor(1.0) {}
 
 // static
@@ -101,9 +101,9 @@ std::string PowerPolicyController::GetPolicyDebugString(
     str += base::StringPrintf("use_audio=%d ", policy.use_audio_activity());
   if (policy.has_use_video_activity())
     str += base::StringPrintf("use_video=%d ", policy.use_audio_activity());
-  if (policy.has_presentation_idle_delay_factor()) {
-    str += base::StringPrintf("presentation_idle_delay_factor=%f ",
-        policy.presentation_idle_delay_factor());
+  if (policy.has_presentation_screen_dim_delay_factor()) {
+    str += base::StringPrintf("presentation_screen_dim_delay_factor=%f ",
+        policy.presentation_screen_dim_delay_factor());
   }
   if (policy.has_user_activity_screen_dim_delay_factor()) {
     str += base::StringPrintf("user_activity_screen_dim_delay_factor=%f ",
@@ -174,8 +174,8 @@ void PowerPolicyController::ApplyPrefs(const PrefValues& values) {
   prefs_policy_.set_lid_closed_action(GetProtoAction(values.lid_closed_action));
   prefs_policy_.set_use_audio_activity(values.use_audio_activity);
   prefs_policy_.set_use_video_activity(values.use_video_activity);
-  prefs_policy_.set_presentation_idle_delay_factor(
-      values.presentation_idle_delay_factor);
+  prefs_policy_.set_presentation_screen_dim_delay_factor(
+      values.presentation_screen_dim_delay_factor);
   prefs_policy_.set_user_activity_screen_dim_delay_factor(
       values.user_activity_screen_dim_delay_factor);
 
diff --git a/chromeos/dbus/power_policy_controller.h b/chromeos/dbus/power_policy_controller.h
index ce5ed05..a2735a1 100644
--- a/chromeos/dbus/power_policy_controller.h
+++ b/chromeos/dbus/power_policy_controller.h
@@ -53,7 +53,7 @@ class CHROMEOS_EXPORT PowerPolicyController
     bool use_video_activity;
     bool allow_screen_wake_locks;
     bool enable_screen_lock;
-    double presentation_idle_delay_factor;
+    double presentation_screen_dim_delay_factor;
     double user_activity_screen_dim_delay_factor;
   };
 
@@ -65,7 +65,7 @@ class CHROMEOS_EXPORT PowerPolicyController
   // screen being locked. Used if the |enable_screen_lock| pref is set but
   // |*_screen_lock_delay_ms| are unset or set to higher values than what
   // this constant would imply.
-  const static int kScreenLockAfterOffDelayMs;
+  static const int kScreenLockAfterOffDelayMs;
 
   PowerPolicyController(DBusThreadManager* manager, PowerManagerClient* client);
   virtual ~PowerPolicyController();
diff --git a/chromeos/dbus/power_policy_controller_unittest.cc b/chromeos/dbus/power_policy_controller_unittest.cc
index fe3601ef..b3b2564 100644
--- a/chromeos/dbus/power_policy_controller_unittest.cc
+++ b/chromeos/dbus/power_policy_controller_unittest.cc
@@ -53,7 +53,7 @@ TEST_F(PowerPolicyControllerTest, Prefs) {
   prefs.use_audio_activity = true;
   prefs.use_video_activity = true;
   prefs.enable_screen_lock = false;
-  prefs.presentation_idle_delay_factor = 3.0;
+  prefs.presentation_screen_dim_delay_factor = 3.0;
   prefs.user_activity_screen_dim_delay_factor = 2.0;
   policy_controller_->ApplyPrefs(prefs);
 
@@ -74,7 +74,7 @@ TEST_F(PowerPolicyControllerTest, Prefs) {
       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_presentation_screen_dim_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),