| Index: ui/gfx/animation/animation_unittest.cc
|
| diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc
|
| index 779e3ecd78cb0e155a3886a42b21b3e241c517a3..d9f30186a399d25d88753cc6d50af9d13170b71d 100644
|
| --- a/ui/gfx/animation/animation_unittest.cc
|
| +++ b/ui/gfx/animation/animation_unittest.cc
|
| @@ -7,10 +7,6 @@
|
| #include "ui/gfx/animation/linear_animation.h"
|
| #include "ui/gfx/animation/test_animation_delegate.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#endif
|
| -
|
| namespace gfx {
|
|
|
| class AnimationTest: public testing::Test {
|
| @@ -125,22 +121,7 @@ TEST_F(AnimationTest, DeleteFromEnd) {
|
| }
|
|
|
| TEST_F(AnimationTest, ShouldRenderRichAnimation) {
|
| -#if defined(OS_WIN)
|
| - if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
|
| - BOOL result;
|
| - ASSERT_NE(
|
| - 0, ::SystemParametersInfo(SPI_GETCLIENTAREAANIMATION, 0, &result, 0));
|
| - // ShouldRenderRichAnimation() should check the SPI_GETCLIENTAREAANIMATION
|
| - // value on Vista.
|
| - EXPECT_EQ(!!result, Animation::ShouldRenderRichAnimation());
|
| - } else {
|
| - // On XP, the function should check the SM_REMOTESESSION value.
|
| - EXPECT_EQ(!::GetSystemMetrics(SM_REMOTESESSION),
|
| - Animation::ShouldRenderRichAnimation());
|
| - }
|
| -#else
|
| EXPECT_TRUE(Animation::ShouldRenderRichAnimation());
|
| -#endif
|
| }
|
|
|
| // Test that current value is always 0 after Start() is called.
|
|
|