summaryrefslogtreecommitdiffstats
path: root/chrome/test/mini_installer_test/test.cc
diff options
context:
space:
mode:
authoranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:26:05 +0000
committeranantha@chromium.org <anantha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:26:05 +0000
commit38993f6f15fb7b12ee4c973910369dc82a1a5595 (patch)
tree4ebe9b3f67bfb50b3df7ac63e5a120717e5d5f9f /chrome/test/mini_installer_test/test.cc
parent3c8808a2b5e3d01505443e4fdcba2a0e0620644a (diff)
downloadchromium_src-38993f6f15fb7b12ee4c973910369dc82a1a5595.zip
chromium_src-38993f6f15fb7b12ee4c973910369dc82a1a5595.tar.gz
chromium_src-38993f6f15fb7b12ee4c973910369dc82a1a5595.tar.bz2
Modified the mini installer tests to work for both Google Chrome and Chromium.
Review URL: http://codereview.chromium.org/7944 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/mini_installer_test/test.cc')
-rw-r--r--chrome/test/mini_installer_test/test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index c88895d..145e2ca 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -18,15 +18,13 @@ class MiniInstallTest : public testing::Test {
};
};
-// This test is disabled. See bug 1199175.
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerCleanInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerCleanInstallTest) {
ChromeMiniInstaller installer;
installer.InstallMiniInstaller();
installer.UnInstall();
}
-// This test is disabled. See bug 1199175.
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeSetupDevTest) {
+TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
ChromeMiniInstaller installer;
installer.OverInstall();
installer.UnInstall();