Move windows version-related stuff out of base/win_util and into base/win/win...

app/animation_unittest.cc

 // Copyright (c) 2010 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 "app/linear_animation.h"
 #include "app/test_animation_delegate.h"
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 
 class AnimationTest: public testing::Test {
  private:
   MessageLoopForUI message_loop_;
 };
 
 namespace {
 
@@ skipping 96 matching lines @@
 TEST_F(AnimationTest, DeleteFromEnd) {
   DeletingAnimationDelegate delegate;
   RunAnimation* animation = new RunAnimation(150, &delegate);
   animation->Start();
   MessageLoop::current()->Run();
   // delegate should have deleted animation.
 }
 
 TEST_F(AnimationTest, ShouldRenderRichAnimation) {
 #if defined(OS_WIN)
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  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
 }