summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 00:33:46 +0000
committeranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 00:33:46 +0000
commit34f4622c1f258b979450642f52a37fbc95931303 (patch)
treeb2534b03017a6d9f8c858a4adbaed834c94056ad
parente6dd4519db3282f11d16c86817fea2dd50d75d2b (diff)
downloadchromium_src-34f4622c1f258b979450642f52a37fbc95931303.zip
chromium_src-34f4622c1f258b979450642f52a37fbc95931303.tar.gz
chromium_src-34f4622c1f258b979450642f52a37fbc95931303.tar.bz2
Enabling the tests after sgk reverted CL18441.
Review URL: http://codereview.chromium.org/125165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18461 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/mini_installer_test/test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 8df69de..2cd1661 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -99,7 +99,7 @@ TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) {
installer.OverInstall();
}
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall,
mini_installer_constants::kDevChannelBuild);
@@ -107,7 +107,7 @@ TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
}
}
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
mini_installer_constants::kDevChannelBuild);