try enabling installer tests again.

Review URL: http://codereview.chromium.org/92016


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14189 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 3 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 5295bb8..b0006f5 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -242,7 +242,7 @@ bool ChromeMiniInstaller::CloseWindow(const wchar_t* window_name,
 bool ChromeMiniInstaller::CloseUninstallWindow() {
   HWND hndl = NULL;
   int timer = 0;
-  while (hndl == NULL && timer < 5000) {
+  while (hndl == NULL && timer < 60000) {
     hndl = FindWindow(NULL,
         mini_installer_constants::kChromeUninstallDialogName);
     PlatformThread::Sleep(200);
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 1b7c15d..6c2252d 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -53,14 +53,14 @@ TEST_F(MiniInstallTest, 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);
     installer.Install();
   }
 }
 
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
   ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
   installer.Install();
 }