cros: Remove some OS platform ifdefs from ash

ash/wm/lock_state_controller_unittest.cc

 // Copyright 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 "ash/wm/lock_state_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 625 matching lines @@
   // Power button is released while system attempts to lock.
   ReleasePowerButton();
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
 
   EXPECT_FALSE(lock_state_controller_->ShutdownRequested());
   EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
   EXPECT_FALSE(test_api_->shutdown_timer_is_running());
 }
 
-// TODO(bruthig): Investigate why this hangs on Windows 8 and whether it can be
-// safely enabled on OS_WIN.
-#ifndef OS_WIN
 // Test that we handle the case where lock requests are ignored.
 TEST_F(LockStateControllerTest, Lock) {
   Initialize(false, LoginStatus::USER);
 
   // Hold the power button and lock the screen.
   PressPowerButton();
   ExpectPreLockAnimationStarted();
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_UNDOABLE);
 
   EXPECT_EQ(1, session_manager_client_->request_lock_screen_call_count());
   EXPECT_TRUE(test_api_->lock_fail_timer_is_running());
   // We shouldn't start the lock-to-shutdown timer until the screen has actually
   // been locked and this was animated.
   EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
 
   // Act as if the request timed out.
   EXPECT_DEATH(test_api_->trigger_lock_fail_timeout(), "");
 }
-#endif
 
 // Test the basic operation of the lock button (not logged in).
 TEST_F(LockStateControllerTest, LockButtonBasicNotLoggedIn) {
   // The lock button shouldn't do anything if we aren't logged in.
   Initialize(false, LoginStatus::NOT_LOGGED_IN);
 
   PressLockButton();
   EXPECT_FALSE(test_api_->is_animating_lock());
   ReleaseLockButton();
   EXPECT_EQ(0, session_manager_client_->request_lock_screen_call_count());
@@ skipping 384 matching lines @@
   ASSERT_EQ(0, delegate->handle_take_screenshot_count());
   PressVolumeDown();
   PressPowerButton();
   ReleasePowerButton();
   ReleaseVolumeDown();
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 }
 
 }  // namespace test
 }  // namespace ash