Re-enable test compositor on ash tests for win8/metro. This allows several additional tests to pass.

BUG=154081
TEST=ash_unittests on Win8/Metro


Review URL: https://chromiumcodereview.appspot.com/11953057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178463 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 56 deletions

diff --git a/ash/wm/session_state_controller_impl2_unittest.cc b/ash/wm/session_state_controller_impl2_unittest.cc
index 0740fb7e..ec676ed 100644
--- a/ash/wm/session_state_controller_impl2_unittest.cc
+++ b/ash/wm/session_state_controller_impl2_unittest.cc
@@ -466,13 +466,6 @@ TEST_F(SessionStateControllerImpl2Test, DISABLED_LegacyLockAndShutDown) {
 // Test that we start shutting down immediately if the power button is pressed
 // while we're not logged in on an unofficial system.
 TEST_F(SessionStateControllerImpl2Test, LegacyNotLoggedIn) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(true, user::LOGGED_IN_NONE);
 
   PressPowerButton();
@@ -484,13 +477,6 @@ TEST_F(SessionStateControllerImpl2Test, LegacyNotLoggedIn) {
 // Test that we start shutting down immediately if the power button is pressed
 // while we're logged in as a guest on an unofficial system.
 TEST_F(SessionStateControllerImpl2Test, LegacyGuest) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(true, user::LOGGED_IN_GUEST);
 
   PressPowerButton();
@@ -502,13 +488,6 @@ TEST_F(SessionStateControllerImpl2Test, LegacyGuest) {
 // When we hold the power button while the user isn't logged in, we should shut
 // down the machine directly.
 TEST_F(SessionStateControllerImpl2Test, ShutdownWhenNotLoggedIn) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(false, user::LOGGED_IN_NONE);
 
   // Press the power button and check that we start the shutdown timer.
@@ -889,13 +868,6 @@ TEST_F(SessionStateControllerImpl2Test, LockWithoutButton) {
 // When we hear that the process is exiting but we haven't had a chance to
 // display an animation, we should just blank the screen.
 TEST_F(SessionStateControllerImpl2Test, ShutdownWithoutButton) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(false, user::LOGGED_IN_USER);
   state_controller_->OnAppTerminating();
 
@@ -910,13 +882,6 @@ TEST_F(SessionStateControllerImpl2Test, ShutdownWithoutButton) {
 // Test that we display the fast-close animation and shut down when we get an
 // outside request to shut down (e.g. from the login or lock screen).
 TEST_F(SessionStateControllerImpl2Test, RequestShutdownFromLoginScreen) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(false, user::LOGGED_IN_NONE);
 
   state_controller_->RequestShutdown();
@@ -934,13 +899,6 @@ TEST_F(SessionStateControllerImpl2Test, RequestShutdownFromLoginScreen) {
 }
 
 TEST_F(SessionStateControllerImpl2Test, RequestShutdownFromLockScreen) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   Initialize(false, user::LOGGED_IN_USER);
 
   SystemLocks();
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 51c2d16..2b0fb2c2 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -870,13 +870,6 @@ TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) {
 }
 
 TEST_F(ShelfLayoutManagerTest, GestureRevealsTrayBubble) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   shelf->LayoutShelf();
 
@@ -922,13 +915,6 @@ TEST_F(ShelfLayoutManagerTest, GestureRevealsTrayBubble) {
 }
 
 TEST_F(ShelfLayoutManagerTest, ShelfFlickerOnTrayActivation) {
-#if defined(OS_WIN)
-  // This test seems to tickle a race condition on Metro/Ash causing the test
-  // suite to crash.
-  // TODO(robertshield): Fix this. http://crbug.com/170418
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8)
-    return;
-#endif
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
 
   // Create a visible window so auto-hide behavior is enforced.