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

chrome/tools/crash_service/crash_service.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 "chrome/tools/crash_service/crash_service.h"
 
 #include <windows.h>
 
 #include <fstream>
 #include <map>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "breakpad/src/client/windows/crash_generation/client_info.h"
 #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"
 #include "breakpad/src/client/windows/sender/crash_report_sender.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 
 namespace {
 
 const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
 
@@ skipping 178 matching lines @@
     if (!sender_) {
       LOG(ERROR) << "could not create sender";
       return false;
     }
     sender_->set_max_reports_per_day(max_reports);
   }
 
   SECURITY_ATTRIBUTES security_attributes = {0};
   SECURITY_ATTRIBUTES* security_attributes_actual = NULL;
 
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     SECURITY_DESCRIPTOR* security_descriptor =
         reinterpret_cast<SECURITY_DESCRIPTOR*>(
             GetSecurityDescriptorForLowIntegrity());
     DCHECK(security_descriptor != NULL);
 
     security_attributes.nLength = sizeof(security_attributes);
     security_attributes.lpSecurityDescriptor = security_descriptor;
     security_attributes.bInheritHandle = FALSE;
 
     security_attributes_actual = &security_attributes;
@@ skipping 242 matching lines @@
                                                              SDDL_REVISION,
                                                              &sec_desc, NULL)) {
     if (::GetSecurityDescriptorSacl(sec_desc, &sacl_present, &sacl,
                                     &sacl_defaulted)) {
       return sec_desc;
     }
   }
 
   return NULL;
 }