diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
| commit | 935aa54d9a5e2e617c61c9f8dcea398768413443 (patch) | |
| tree | 3df9ec9316cd4d5b7171e5c6c869a01d823cc507 /chrome/test | |
| parent | 7d1f3348c26eda2d1656860c821d335bf94d4cda (diff) | |
| download | chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.zip chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.gz chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.bz2 | |
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
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/mini_installer_test/test.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc index 23c1682..bdc1b29 100644 --- a/chrome/test/mini_installer_test/test.cc +++ b/chrome/test/mini_installer_test/test.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/platform_thread.h" #include "base/scoped_ptr.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/util_constants.h" @@ -51,7 +51,7 @@ class MiniInstallTest : public testing::Test { build = L"latest"; force_tests_ = cmd->HasSwitch(switches::kInstallerTestForce); chrome_frame_ = cmd->HasSwitch(installer_util::switches::kChromeFrame); - if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA || + if (base::win::GetVersion() < base::win::VERSION_VISTA || force_tests_) { CleanTheSystem(); // Separate the test output from cleaning output diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 58a1007..4459e87 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -50,7 +50,7 @@ #include "net/base/net_util.h" #if defined(OS_WIN) -#include "base/win_util.h" +#include "base/win/windows_version.h" #endif @@ -940,7 +940,7 @@ void UITest::StartHttpServerWithPort(const FilePath& root_directory, // it will mess up with the command window and cause conhost.exe to crash. To // work around this, we start the http server on the background mode. #if defined(OS_WIN) - if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7) + if (base::win::GetVersion() >= base::win::VERSION_WIN7) cmd_line->AppendSwitch("run_background"); #endif |