Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/test/mini_installer_test/test.cc

Issue 28128: Fix all places where we used the GetWinVersion function... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "base/win_util.h" 4 #include "base/win_util.h"
5 #include "chrome/installer/util/install_util.h" 5 #include "chrome/installer/util/install_util.h"
6 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" 6 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 #include "chrome_mini_installer.h" 9 #include "chrome_mini_installer.h"
10 10
11 namespace { 11 namespace {
12 class MiniInstallTest : public testing::Test { 12 class MiniInstallTest : public testing::Test {
13 protected: 13 protected:
14 virtual void SetUp() { 14 virtual void SetUp() {
15 ChromeMiniInstaller userinstall(mini_installer_constants::kUserInstall); 15 ChromeMiniInstaller userinstall(mini_installer_constants::kUserInstall);
16 userinstall.UnInstall(); 16 userinstall.UnInstall();
17 if (win_util::GetWinVersion() != win_util::WINVERSION_VISTA) { 17 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
18 ChromeMiniInstaller systeminstall( 18 ChromeMiniInstaller systeminstall(
19 mini_installer_constants::kSystemInstall); 19 mini_installer_constants::kSystemInstall);
20 systeminstall.UnInstall(); 20 systeminstall.UnInstall();
21 } 21 }
22 } 22 }
23 23
24 virtual void TearDown() { 24 virtual void TearDown() {
25 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 25 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
26 installer.CloseProcesses(installer_util::kChromeExe); 26 installer.CloseProcesses(installer_util::kChromeExe);
27 } 27 }
28 }; 28 };
29 }; 29 };
30 30
31 TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) { 31 TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
32 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 32 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
33 installer.OverInstall(); 33 installer.OverInstall();
34 } 34 }
35 35
36 TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) { 36 TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
37 if (win_util::GetWinVersion() != win_util::WINVERSION_VISTA) { 37 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
38 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall); 38 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall);
39 installer.InstallMiniInstaller(); 39 installer.InstallMiniInstaller();
40 } 40 }
41 } 41 }
42 42
43 TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) { 43 TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
44 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 44 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
45 installer.InstallMiniInstaller(); 45 installer.InstallMiniInstaller();
46 } 46 }
47 47
OLDNEW
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698