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

base/base_paths_win.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 "base/base_paths_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 namespace base {
 
 bool PathProviderWin(int key, FilePath* result) {
 
   // We need to go compute the value. It would be nice to support paths with
   // names longer than MAX_PATH, but the system functions don't seem to be
@@ skipping 55 matching lines @@
         return false;
       cur = FilePath(system_buffer);
       break;
     case base::DIR_PROFILE:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT,
                                  system_buffer)))
         return false;
       cur = FilePath(system_buffer);
       break;
     case base::DIR_LOCAL_APP_DATA_LOW:
-      if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+      if (win::GetVersion() < win::VERSION_VISTA) {
         return false;
       }
       // TODO(nsylvain): We should use SHGetKnownFolderPath instead. Bug 1281128
       if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT,
                                  system_buffer)))
         return false;
       cur = FilePath(system_buffer).DirName().AppendASCII("LocalLow");
       break;
     case base::DIR_LOCAL_APP_DATA:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL,
@@ skipping 19 matching lines @@
     }
     default:
       return false;
   }
 
   *result = cur;
   return true;
 }
 
 }  // namespace base