Enabling the user install tests to see if they pass. They were failing because of two reasons:

1. the new profile dialog closes the setup.exe process as soon as the dialog is closed. The testcase used to wait for setup.exe to start/end, which would never happen. heence the test failed.
2. Closing of new profile dialog also deletes the reg keys right away. looks like there were some timing issues.Added a sleep of 400 to see if the test passes now. if it passes, then I will look into other options and remove the sleep.
-----

The standalone installer path got changed recently. modified that path also.


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

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

3 files changed, 3 insertions, 4 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index e18a1c68..3149a6e 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -215,9 +215,8 @@ void ChromeMiniInstaller::UnInstall() {
   base::LaunchApp(uninstall_args, false, false, NULL);
   printf("Launched setup.exe -uninstall....\n");
   ASSERT_TRUE(CloseUninstallWindow());
-  WaitUntilProcessStopsRunning(
-      mini_installer_constants::kChromeSetupExecutable);
   printf("\n\nUninstall Checks:\n\n");
+  PlatformThread::Sleep(400);
   ASSERT_FALSE(CheckRegistryKey(dist->GetVersionKey()));
   DeleteAppFolder();
   FindChromeShortcut();
diff --git a/chrome/test/mini_installer_test/mini_installer_test_constants.cc b/chrome/test/mini_installer_test/mini_installer_test_constants.cc
index 9a530e1..55e2083 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_constants.cc
+++ b/chrome/test/mini_installer_test/mini_installer_test_constants.cc
@@ -41,7 +41,7 @@ const wchar_t kDevChannelBuildPattern[] = L"2.0.";
 const wchar_t kChromeMetaInstallerExe[] =
     L"\\\\172.23.44.61\\shared\\chrome_autotest\\beta_build\\ChromeSetup.exe";
 const wchar_t kChromeStandAloneInstallerLocation[] =
-    L"\\\\172.24.6.7\\shares\\googleclient\\nightly\\builds\\Win-OmahaInstallers\\latest\\opt\\";
+    L"\\\\172.24.6.7\\shares\\googleclient\\nightly\\builds\\Win-OmahaInstallers\\latest\\opt-win\\staging\\";
 const wchar_t kChromeApplyTagExe[] =
     L"\\\\172.23.44.61\\shared\\chrome_autotest\\ApplyTag.exe";
 const wchar_t kChromeApplyTagParameters[] =
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 1ddb44b..a2e6419 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/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();