Try --force-uninstall param to see if that fixes installer tests.

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


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

chrome/test/mini_installer_test/chrome_mini_installer.cc

@@ -209,12 +209,12 @@ void ChromeMiniInstaller::UnInstall() {
   }
   ASSERT_TRUE(file_util::PathExists(uninstall_path));
   std::wstring uninstall_args = L"\"" + uninstall_path +
-                                L"\"" + L" -uninstall";
+                                L"\"" + L" --uninstall --force-uninstall";
   if (install_type_ == mini_installer_constants::kSystemInstall)
-    uninstall_args = uninstall_args + L" -system-level";
+    uninstall_args = uninstall_args + L" --system-level";
   base::LaunchApp(uninstall_args, false, false, NULL);
-  printf("Launched setup.exe -uninstall....\n");
-  ASSERT_TRUE(CloseUninstallWindow());
+  printf("Launched setup.exe --uninstall --force-uninstall....\n");
+  // ASSERT_TRUE(CloseUninstallWindow());
   WaitUntilProcessStopsRunning(
       mini_installer_constants::kChromeSetupExecutable);
   printf("\n\nUninstall Checks:\n\n");

chrome/test/mini_installer_test/test.cc

@@ -60,7 +60,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);
     installer.Install();