| Index: chrome/test/mini_installer_test/chrome_mini_installer.cc
|
| ===================================================================
|
| --- chrome/test/mini_installer_test/chrome_mini_installer.cc (revision 14747)
|
| +++ chrome/test/mini_installer_test/chrome_mini_installer.cc (working copy)
|
| @@ -218,7 +218,7 @@
|
| WaitUntilProcessStopsRunning(
|
| mini_installer_constants::kChromeSetupExecutable);
|
| printf("\n\nUninstall Checks:\n\n");
|
| - ASSERT_FALSE(CheckRegistryKey(dist->GetVersionKey()));
|
| + ASSERT_FALSE(CheckRegistryKeyOnUninstall(dist->GetVersionKey()));
|
| DeleteAppFolder();
|
| FindChromeShortcut();
|
| CloseProcesses(mini_installer_constants::kIEExecutable);
|
| @@ -318,6 +318,19 @@
|
| return true;
|
| }
|
|
|
| +// Checks for Chrome registry keys on uninstall.
|
| +bool ChromeMiniInstaller::CheckRegistryKeyOnUninstall(
|
| + const std::wstring& key_path) {
|
| + RegKey key;
|
| + int timer = 0;
|
| + while ((key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS)) &&
|
| + (timer < 20000)) {
|
| + PlatformThread::Sleep(200);
|
| + timer = timer + 200;
|
| + }
|
| + return CheckRegistryKey(key_path);
|
| +}
|
| +
|
| // Deletes App folder after uninstall.
|
| void ChromeMiniInstaller::DeleteAppFolder() {
|
| std::wstring path = GetChromeInstallDirectoryLocation();
|
|
|