Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1282)

Unified Diff: chrome/test/mini_installer_test/installer_test_util.cc

Issue 10821062: Fix CleanupProcesses() interface to use TimeDelta. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/installer_test_util.cc
diff --git a/chrome/test/mini_installer_test/installer_test_util.cc b/chrome/test/mini_installer_test/installer_test_util.cc
index a9c6d5934e83c0e2a6db9554385d1c085d93f43a..087df7e3947081828fe98c87f8a7bacedef2dc96 100644
--- a/chrome/test/mini_installer_test/installer_test_util.cc
+++ b/chrome/test/mini_installer_test/installer_test_util.cc
@@ -179,7 +179,7 @@ bool Install(const FilePath& installer, const SwitchBuilder& switches) {
}
bool LaunchChrome(bool close_after_launch, bool system_level) {
- base::CleanupProcesses(installer::kChromeExe, 0,
+ base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
FilePath install_path;
if (!GetChromeInstallDirectory(
@@ -218,9 +218,9 @@ bool LaunchIE(const std::string& url) {
}
bool UninstallAll() {
- base::CleanupProcesses(installer::kChromeExe, 0,
+ base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
- base::CleanupProcesses(installer::kChromeFrameHelperExe, 0,
+ base::CleanupProcesses(installer::kChromeFrameHelperExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
std::vector<installer_test::InstalledProduct> installed;
if (!GetInstalledProducts(&installed)) {
@@ -273,7 +273,8 @@ bool Uninstall(bool system_level,
LOG(INFO) << "Uninstall command: " << uninstall_cmd.GetCommandLineString();
bool ret_val = RunAndWaitForCommandToFinish(uninstall_cmd);
// Close IE notification when uninstalling Chrome Frame.
- base::CleanupProcesses(mini_installer_constants::kIEProcessName, 0,
+ base::CleanupProcesses(mini_installer_constants::kIEProcessName,
+ base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
return ret_val;
}
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698