chromeos: Save display power state on config failure.

chrome/browser/chromeos/display/display_preferences.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/shell.h"
@@ skipping 290 matching lines @@
   const DisplayPowerStateToStringMap* map = GetDisplayPowerStateToStringMap();
   DisplayPowerStateToStringMap::const_iterator iter = map->find(power_state);
   if (iter != map->end()) {
     PrefService* local_state = g_browser_process->local_state();
     local_state->SetString(prefs::kDisplayPowerState, iter->second);
   }
 }
 
 void StoreCurrentDisplayPowerState() {
   StoreDisplayPowerState(
-      ash::Shell::GetInstance()->display_configurator()->power_state());
+      ash::Shell::GetInstance()->display_configurator()->
+          requested_power_state());
 }
 
 void StoreCurrentDisplayRotationLockPrefs() {
   bool rotation_lock = ash::Shell::GetInstance()->display_manager()->
       registered_internal_display_rotation_lock();
   StoreDisplayRotationPrefs(rotation_lock);
 }
 
 }  // namespace
 
@@ skipping 64 matching lines @@
                                    const ash::DisplayLayout& layout) {
   StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos