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

gfx/native_theme_win.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 "gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/logging.h"
 #include "base/scoped_handle.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "gfx/gdi_util.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
 
 void SetCheckerboardShader(SkPaint* paint, const RECT& align_rect) {
   // Create a 2x2 checkerboard pattern using the 3D face and highlight colors.
@@ skipping 503 matching lines @@
   // size of moving overlay of the indeterminate progress bar.
   // So we just observed real-world programs and guessed following parameters.
   const int kDeteminateOverlayPixelsPerSecond = 300;
   const int kDeteminateOverlayWidth = 120;
   const int kIndeterminateOverlayPixelsPerSecond =  175;
   const int kVistaIndeterminateOverlayWidth = 120;
   const int kXPIndeterminateOverlayWidth = 55;
   // The thickness of the bar frame inside |value_rect|
   const int kXPBarPadding = 3;
 
-  bool pre_vista = win_util::GetWinVersion() < win_util::WINVERSION_VISTA;
+  bool pre_vista = base::win::GetVersion() < base::win::VERSION_VISTA;
   HANDLE handle = GetThemeHandle(PROGRESS);
   if (handle && draw_theme_ && draw_theme_ex_) {
     draw_theme_(handle, hdc, PP_BAR, 0, bar_rect, NULL);
 
     int bar_width = bar_rect->right - bar_rect->left;
     if (determinate) {
       // TODO(morrita): this RTL guess can be wrong.
       // We should pass the direction from WebKit side.
       bool is_rtl = (bar_rect->right == value_rect->right &&
                      bar_rect->left != value_rect->left);
@@ skipping 314 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace gfx