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

Unified Diff: chrome/browser/chromeos/policy/power_policy_browsertest.cc

Issue 123833004: Tentatively re-enable previously flaky tests. (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
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f5843bc7823825c26b6b2aadd79cdf0f0bb8609e..1c6775cad5afc2db422d7d68c5edd2a9e15816c0 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -288,9 +288,7 @@ void PowerPolicyInSessionBrowserTest::SetUpOnMainThread() {
}
// Verifies that device policy is applied on the login screen.
-// http://crbug.com/330454
-IN_PROC_BROWSER_TEST_F(PowerPolicyLoginScreenBrowserTest,
- DISABLED_SetDevicePolicy) {
+IN_PROC_BROWSER_TEST_F(PowerPolicyLoginScreenBrowserTest, SetDevicePolicy) {
pm::PowerManagementPolicy power_management_policy =
power_manager_client_->get_policy();
power_management_policy.mutable_ac_delays()->set_screen_dim_ms(5000);
@@ -316,9 +314,7 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyLoginScreenBrowserTest,
}
// Verifies that device policy is ignored during a session.
-// http://crbug.com/330454
-IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest,
- DISABLED_SetDevicePolicy) {
+IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, SetDevicePolicy) {
pm::PowerManagementPolicy power_management_policy =
power_manager_client_->get_policy();
@@ -331,9 +327,7 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest,
}
// Verifies that user policy is applied during a session.
-// http://crbug.com/330454
-IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest,
- DISABLED_SetUserPolicy) {
+IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, SetUserPolicy) {
pm::PowerManagementPolicy power_management_policy =
power_manager_client_->get_policy();
power_management_policy.mutable_ac_delays()->set_screen_dim_ms(5000);
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698