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

base/process_util_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 "base/process_util.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>
 #include <userenv.h>
 #include <psapi.h>
 
 #include <ios>
 
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_handle_win.h"
 #include "base/scoped_ptr.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 
 // userenv.dll is required for CreateEnvironmentBlock().
 #pragma comment(lib, "userenv.lib")
 
 namespace base {
 
 namespace {
 
 // System pagesize. This value remains constant on x86/64 architectures.
 const int PAGESIZE_KB = 4;
@@ skipping 116 matching lines @@
 
   // We're screwed.
   NOTREACHED();
   return 0;
 }
 
 bool GetProcessIntegrityLevel(ProcessHandle process, IntegrityLevel *level) {
   if (!level)
     return false;
 
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return false;
 
   HANDLE process_token;
   if (!OpenProcessToken(process, TOKEN_QUERY | TOKEN_QUERY_SOURCE,
       &process_token))
     return false;
 
   ScopedHandle scoped_process_token(process_token);
 
   DWORD token_info_length = 0;
@@ skipping 718 matching lines @@
 
   PERFORMANCE_INFORMATION info;
   if (!InternalGetPerformanceInfo(&info, sizeof(info))) {
     LOG(ERROR) << "Failed to fetch internal performance info.";
     return 0;
   }
   return (info.CommitTotal * system_info.dwPageSize) / 1024;
 }
 
 }  // namespace base