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

chrome/browser/diagnostics/recon_diagnostics.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/browser/diagnostics/recon_diagnostics.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/path_service.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/json_value_serializer.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/installer/util/install_util.h"
 #endif
 
 // Reconnaissance diagnostics. These are the first and most critical
 // diagnostic tests. Here we check for the existence of critical files.
 // TODO(cpu): Define if it makes sense to localize strings.
 
 // TODO(cpu): There are a few maxium file sizes hardcoded in this file
 // that have little or no theoretical or experimental ground. Find a way
 // to justify them.
 
 namespace {
 
 class InstallTypeTest;
 InstallTypeTest* g_install_type = 0;
 
 // Check that the flavor of the operating system is supported.
 class OperatingSystemTest : public DiagnosticTest {
  public:
   OperatingSystemTest() : DiagnosticTest(ASCIIToUTF16("Operating System")) {}
 
   virtual int GetId() { return 0; }
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) {
     int version = 0;
     int major = 0;
     int minor = 0;
 #if defined(OS_WIN)
-    version = win_util::GetWinVersion();
-    if (version < win_util::WINVERSION_XP) {
+    version = base::win::GetVersion();
+    if (version < base::win::VERSION_XP) {
       RecordFailure(ASCIIToUTF16("Windows 2000 or earlier"));
       return false;
     }
-    win_util::GetServicePackLevel(&major, &minor);
-    if ((version == win_util::WINVERSION_XP) && (major < 2)) {
+    base::win::GetServicePackLevel(&major, &minor);
+    if ((version == base::win::VERSION_XP) && (major < 2)) {
       RecordFailure(ASCIIToUTF16("XP Service Pack 1 or earlier"));
       return false;
     }
 #else
     // TODO(port): define the OS criteria for linux and mac.
 #endif  // defined(OS_WIN)
     RecordSuccess(ASCIIToUTF16(StringPrintf("%s %s (%d [%d:%d])",
         base::SysInfo::OperatingSystemName().c_str(),
         base::SysInfo::OperatingSystemVersion().c_str(),
         version, major, minor)));
@@ skipping 282 matching lines @@
   path = path.Append(chrome::kBookmarksFileName);
   return new JSONTest(path, ASCIIToUTF16("BookMarks JSON"), 2 * kOneMeg);
 }
 
 DiagnosticTest* MakeLocalStateTest() {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(chrome::kLocalStateFilename);
   return new JSONTest(path, ASCIIToUTF16("Local State JSON"), 50 * kOneKilo);
 }