Tentatively re-enable previously flaky tests.

chrome/browser/chromeos/policy/power_policy_browsertest.cc

 // Copyright (c) 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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 270 matching lines @@
 }
 
 void PowerPolicyInSessionBrowserTest::SetUpOnMainThread() {
   PowerPolicyBrowserTestBase::SetUpOnMainThread();
 
   // Tell the DeviceSettingsService that there is no local owner.
   chromeos::DeviceSettingsService::Get()->SetUsername(std::string());
 }
 
 // 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);
   power_management_policy.mutable_ac_delays()->set_screen_off_ms(7000);
   power_management_policy.mutable_ac_delays()->set_idle_ms(9000);
   power_management_policy.mutable_battery_delays()->set_screen_dim_ms(1000);
   power_management_policy.mutable_battery_delays()->set_screen_off_ms(3000);
   power_management_policy.mutable_battery_delays()->set_idle_ms(4000);
   power_management_policy.set_ac_idle_action(
       pm::PowerManagementPolicy::DO_NOTHING);
   power_management_policy.set_battery_idle_action(
       pm::PowerManagementPolicy::DO_NOTHING);
   power_management_policy.set_lid_closed_action(
       pm::PowerManagementPolicy::DO_NOTHING);
   power_management_policy.set_user_activity_screen_dim_delay_factor(3.0);
 
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_login_screen_power_management()->
       set_login_screen_power_management(kLoginScreenPowerManagementPolicy);
   StoreAndReloadDevicePolicyAndWaitForLoginProfileChange();
   EXPECT_EQ(GetDebugString(power_management_policy),
             GetDebugString(power_manager_client_->get_policy()));
 }
 
 // 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();
 
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_login_screen_power_management()->
       set_login_screen_power_management(kLoginScreenPowerManagementPolicy);
   StoreAndReloadDevicePolicyAndWaitForLoginProfileChange();
   EXPECT_EQ(GetDebugString(power_management_policy),
             GetDebugString(power_manager_client_->get_policy()));
 }
 
 // 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);
   power_management_policy.mutable_ac_delays()->set_screen_lock_ms(6000);
   power_management_policy.mutable_ac_delays()->set_screen_off_ms(7000);
   power_management_policy.mutable_ac_delays()->set_idle_warning_ms(8000);
   power_management_policy.mutable_ac_delays()->set_idle_ms(9000);
   power_management_policy.mutable_battery_delays()->set_screen_dim_ms(1000);
   power_management_policy.mutable_battery_delays()->set_screen_lock_ms(2000);
   power_management_policy.mutable_battery_delays()->set_screen_off_ms(3000);
@@ skipping 82 matching lines @@
   policy.set_ac_idle_action(
       power_manager_client_->get_policy().ac_idle_action());
   policy.set_battery_idle_action(
       power_manager_client_->get_policy().battery_idle_action());
   policy.set_reason(power_manager_client_->get_policy().reason());
   EXPECT_EQ(GetDebugString(policy),
             GetDebugString(power_manager_client_->get_policy()));
 }
 
 }  // namespace policy