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

base/file_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/file_util.h"
 
 #include <windows.h>
 #include <propvarutil.h>
 #include <psapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/pe_image.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_handle.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 
 namespace file_util {
 
 namespace {
 
 const DWORD kFileShareAll =
     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
 
 // Helper for NormalizeFilePath(), defined below.
 bool DevicePathToDriveLetterPath(const FilePath& device_path,
@@ skipping 218 matching lines @@
     return ShellCopy(from_path, to_path, true);
 
   // The following code assumes that from path is a directory.
   DCHECK(DirectoryExists(from_path));
 
   // Instead of creating a new directory, we copy the old one to include the
   // security information of the folder as part of the copy.
   if (!PathExists(to_path)) {
     // Except that Vista fails to do that, and instead do a recursive copy if
     // the target directory doesn't exist.
-    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
+    if (base::win::GetVersion() >= base::win::VERSION_VISTA)
       CreateDirectory(to_path);
     else
       ShellCopy(from_path, to_path, false);
   }
 
   FilePath directory = from_path.Append(L"*.*");
   return ShellCopy(directory, to_path, false);
 }
 
 bool CopyAndDeleteDirectory(const FilePath& from_path,
@@ skipping 120 matching lines @@
 
   if (arguments && FAILED(i_shell_link->SetArguments(arguments)))
     return false;
 
   if (description && FAILED(i_shell_link->SetDescription(description)))
     return false;
 
   if (icon && FAILED(i_shell_link->SetIconLocation(icon, icon_index)))
     return false;
 
-  if (app_id && (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)) {
+  if (app_id && (base::win::GetVersion() >= base::win::VERSION_WIN7)) {
     ScopedComPtr<IPropertyStore> property_store;
     if (FAILED(property_store.QueryFrom(i_shell_link)))
       return false;
 
     if (!win_util::SetAppIdForPropertyStore(property_store, app_id))
       return false;
   }
 
   result = i_persist_file->Save(destination, TRUE);
   return SUCCEEDED(result);
@@ skipping 29 matching lines @@
 
   if (arguments && FAILED(i_shell_link->SetArguments(arguments)))
     return false;
 
   if (description && FAILED(i_shell_link->SetDescription(description)))
     return false;
 
   if (icon && FAILED(i_shell_link->SetIconLocation(icon, icon_index)))
     return false;
 
-  if (app_id && win_util::GetWinVersion() >= win_util::WINVERSION_WIN7) {
+  if (app_id && base::win::GetVersion() >= base::win::VERSION_WIN7) {
     ScopedComPtr<IPropertyStore> property_store;
     if (FAILED(property_store.QueryFrom(i_shell_link)))
       return false;
 
     if (!win_util::SetAppIdForPropertyStore(property_store, app_id))
       return false;
   }
 
   HRESULT result = i_persist_file->Save(destination, TRUE);
   return SUCCEEDED(result);
 }
 
 bool TaskbarPinShortcutLink(const wchar_t* shortcut) {
   // "Pin to taskbar" is only supported after Win7.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return false;
 
   int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarpin", shortcut,
       NULL, NULL, 0));
   return result > 32;
 }
 
 bool TaskbarUnpinShortcutLink(const wchar_t* shortcut) {
   // "Unpin from taskbar" is only supported after Win7.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return false;
 
   int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarunpin",
       shortcut, NULL, NULL, 0));
   return result > 32;
 }
 
 bool GetTempDir(FilePath* path) {
   wchar_t temp_path[MAX_PATH + 1];
   DWORD path_len = ::GetTempPath(MAX_PATH, temp_path);
@@ skipping 508 matching lines @@
   if (::GetMappedFileNameW(cp, file_view, mapped_file_path, kMaxPathLength)) {
     *nt_path = FilePath(mapped_file_path);
     success = true;
   }
   ::UnmapViewOfFile(file_view);
   return success;
 }
 
 bool PreReadImage(const wchar_t* file_path, size_t size_to_read,
                   size_t step_size) {
-  if (win_util::GetWinVersion() > win_util::WINVERSION_XP) {
+  if (base::win::GetVersion() > base::win::VERSION_XP) {
     // Vista+ branch. On these OSes, the forced reads through the DLL actually
     // slows warm starts. The solution is to sequentially read file contents
     // with an optional cap on total amount to read.
     ScopedHandle file(
         CreateFile(file_path,
                    GENERIC_READ,
                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                    NULL,
                    OPEN_EXISTING,
                    FILE_FLAG_SEQUENTIAL_SCAN,
@@ skipping 43 matching lines @@
       uint8 unused = *(touch + offset);
       offset += step_size;
     }
     FreeLibrary(dll_module);
   }
 
   return true;
 }
 
 }  // namespace file_util