Revert of Revert of chromeos: Don't send empty power management policies.

chrome/browser/chromeos/power/power_prefs_unittest.cc

 // Copyright 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 "chrome/browser/chromeos/power/power_prefs.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 122 matching lines @@
   expected_policy.set_user_activity_screen_dim_delay_factor(
       prefs->GetDouble(prefs::kPowerUserActivityScreenDimDelayFactor));
   expected_policy.set_wait_for_initial_user_activity(
       prefs->GetBoolean(prefs::kPowerWaitForInitialUserActivity));
   expected_policy.set_reason("Prefs");
   return PowerPolicyController::GetPolicyDebugString(expected_policy);
 }
 
 std::string PowerPrefsTest::GetCurrentPowerPolicy() const {
   return PowerPolicyController::GetPolicyDebugString(
-      fake_power_manager_client_->get_policy());
+      fake_power_manager_client_->policy());
 }
 
 bool PowerPrefsTest::GetCurrentAllowScreenWakeLocks() const {
   return power_policy_controller_->honor_screen_wake_locks_;
 }
 
 bool PowerPrefsTest::GetExpectedAllowScreenWakeLocksForProfile(
     Profile* profile) const {
   return profile->GetPrefs()->GetBoolean(prefs::kPowerAllowScreenWakeLocks);
 }
@@ skipping 41 matching lines @@
   EXPECT_EQ(GetExpectedPowerPolicyForProfile(login_profile),
             GetCurrentPowerPolicy());
   EXPECT_EQ(GetExpectedAllowScreenWakeLocksForProfile(login_profile),
             GetCurrentAllowScreenWakeLocks());
 
   // Inform power_prefs_ that the login profile has been destroyed.
   power_prefs_->Observe(chrome::NOTIFICATION_PROFILE_DESTROYED,
                         content::Source<Profile>(login_profile),
                         content::NotificationService::NoDetails());
 
+  // The login profile's prefs should still be used.
   EXPECT_FALSE(GetProfile());
-  EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(
-                power_manager::PowerManagementPolicy()),
+  EXPECT_EQ(GetExpectedPowerPolicyForProfile(login_profile),
             GetCurrentPowerPolicy());
 }
 
 TEST_F(PowerPrefsTest, UserSession) {
   // Set up user profile.
   TestingProfile* user_profile = profile_manager_.CreateTestingProfile("user");
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kLoginProfile,
                                                       "user");
   profile_manager_.SetLoggedIn(true);
 
@@ skipping 34 matching lines @@
             GetCurrentPowerPolicy());
   EXPECT_EQ(GetExpectedAllowScreenWakeLocksForProfile(user_profile),
             GetCurrentAllowScreenWakeLocks());
 
   // Inform power_prefs_ that the session has ended and the user profile has
   // been destroyed.
   power_prefs_->Observe(chrome::NOTIFICATION_PROFILE_DESTROYED,
                         content::Source<Profile>(user_profile),
                         content::NotificationService::NoDetails());
 
+  // The user profile's prefs should still be used.
   EXPECT_FALSE(GetProfile());
-  EXPECT_EQ(PowerPolicyController::GetPolicyDebugString(
-                power_manager::PowerManagementPolicy()),
+  EXPECT_EQ(GetExpectedPowerPolicyForProfile(user_profile),
             GetCurrentPowerPolicy());
 }
 
 }  // namespace chromeos