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

chrome/browser/importer/ie_importer.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/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
 #include <urlhist.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
@@ skipping 416 matching lines @@
   wchar_t buffer[MAX_PATH];
   if (FAILED(SHGetFolderPath(NULL, CSIDL_FAVORITES, NULL,
                              SHGFP_TYPE_CURRENT, buffer)))
     return false;
   info->path = buffer;
 
   // There is a Links folder under Favorites folder in Windows Vista, but it
   // is not recording in Vista's registry. So in Vista, we assume the Links
   // folder is under Favorites folder since it looks like there is not name
   // different in every language version of Windows Vista.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     // The Link folder name is stored in the registry.
     DWORD buffer_length = sizeof(buffer);
     RegKey reg_key(HKEY_CURRENT_USER,
                    L"Software\\Microsoft\\Internet Explorer\\Toolbar",
                    KEY_READ);
     if (!reg_key.ReadValue(L"LinksFolderName", buffer, &buffer_length, NULL))
       return false;
     info->links_folder = buffer;
   } else {
     info->links_folder = L"Links";
@@ skipping 99 matching lines @@
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     RegKey reg_key(HKEY_LOCAL_MACHINE,
                    L"Software\\Microsoft\\Internet Explorer", KEY_READ);
     bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = (result ? _wtoi(buffer) : 0);
   }
   return version;
 }