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

app/l10n_util_unittest.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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
 #include "app/app_paths.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #if !defined(OS_MACOSX)
 #include "app/test/data/resource.h"
 #endif
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
 
 namespace {
 
 class StringWrapper {
  public:
   explicit StringWrapper(const std::wstring& string) : string_(string) {}
@@ skipping 196 matching lines @@
   SetICUDefaultLocale("es-AR");
   EXPECT_EQ("es", l10n_util::GetApplicationLocale("es"));
 
   SetICUDefaultLocale("zh-HK");
   EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale("zh-CN"));
 
   SetICUDefaultLocale("he");
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale("en"));
 
   // Amharic should be blocked unless OS is Vista or newer.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     SetICUDefaultLocale("am");
     EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
     SetICUDefaultLocale("en-GB");
     EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("am"));
   } else {
     SetICUDefaultLocale("am");
     EXPECT_EQ("am", l10n_util::GetApplicationLocale(""));
     SetICUDefaultLocale("en-GB");
     EXPECT_EQ("am", l10n_util::GetApplicationLocale("am"));
   }
@@ skipping 42 matching lines @@
 
   result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Chinese (Traditional Han)"));
 
   result = l10n_util::GetDisplayNameForLocale("pt-BR", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Portuguese (Brazil)"));
 
   result = l10n_util::GetDisplayNameForLocale("es-419", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Spanish (Latin America and the Caribbean)"));
 }