Move windows version-related stuff out of base/win_util and into base/win/windows_version. Many files now only need to include this instead of all of win_util.
Remove a bunch of unused code from base/win_util. There was a surprising amount.
Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62694 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc
index 1d58df92..5745c50 100644
--- a/chrome_frame/delete_chrome_history.cc
+++ b/chrome_frame/delete_chrome_history.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/browsing_data_remover.h"
+#include "base/win/windows_version.h"
#include "chrome_frame/chrome_frame_activex.h"
#include "chrome_frame/utils.h"
@@ -65,7 +66,7 @@
// effort to connect. Thus, we detect if we are in that circumstance and exit
// silently.
base::IntegrityLevel integrity_level;
- if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
+ if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
!base::GetProcessIntegrityLevel(base::GetCurrentProcessHandle(),
&integrity_level)) {
return E_UNEXPECTED;
