Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: chrome/browser/chromeos/power/power_prefs_unittest.cc

Issue 129303003: Revert of Revert of chromeos: Don't send empty power management policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/power/power_prefs_unittest.cc
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index 5abc8106828b866b7c23a1c2661d1bb4f8a84a85..a3289195745f143592244754ff53d1d13fa2645b 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -140,7 +140,7 @@
std::string PowerPrefsTest::GetCurrentPowerPolicy() const {
return PowerPolicyController::GetPolicyDebugString(
- fake_power_manager_client_->get_policy());
+ fake_power_manager_client_->policy());
}
bool PowerPrefsTest::GetCurrentAllowScreenWakeLocks() const {
@@ -202,9 +202,9 @@
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());
}
@@ -259,9 +259,9 @@
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());
}
« no previous file with comments | « chrome/browser/chromeos/power/power_prefs.cc ('k') | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698