| Index: chrome/browser/policy/policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
|
| index cb230b6dbd383a6273726c2f41ae7f4da8cd6fa3..e1b4523115ee61d5a32a51145d0368e347354713 100644
|
| --- a/chrome/browser/policy/policy_browsertest.cc
|
| +++ b/chrome/browser/policy/policy_browsertest.cc
|
| @@ -2965,9 +2965,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
|
| Mock::VerifyAndClearExpectations(&observer);
|
| }
|
|
|
| -// Disabled, see http://crbug.com/315308.
|
| IN_PROC_BROWSER_TEST_F(PolicyTest,
|
| - DISABLED_PRE_WaitForInitialUserActivitySatisfied) {
|
| + PRE_WaitForInitialUserActivitySatisfied) {
|
| // Indicate that initial user activity in this session occurred 2 hours ago.
|
| g_browser_process->local_state()->SetInt64(
|
| prefs::kSessionStartTime,
|
| @@ -2978,9 +2977,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
|
| true);
|
| }
|
|
|
| -// Disabled, see http://crbug.com/315308.
|
| IN_PROC_BROWSER_TEST_F(PolicyTest,
|
| - DISABLED_WaitForInitialUserActivitySatisfied) {
|
| + WaitForInitialUserActivitySatisfied) {
|
| content::MockNotificationObserver observer;
|
| content::NotificationRegistrar registrar;
|
| registrar.Add(&observer,
|
|
|