Fix CleanupProcesses() interface to use TimeDelta.

BUG=108171


Review URL: https://chromiumcodereview.appspot.com/10821062

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

6 files changed, 20 insertions, 24 deletions

diff --git a/base/process_util.h b/base/process_util.h
index 6745d4b..04c1d88d 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -532,7 +532,7 @@ BASE_EXPORT bool WaitForSingleProcess(ProcessHandle handle,
 // any processes needed to be killed, true if they all exited cleanly within
 // the wait_milliseconds delay.
 BASE_EXPORT bool CleanupProcesses(const FilePath::StringType& executable_name,
-                                  int64 wait_milliseconds,
+                                  base::TimeDelta wait,
                                   int exit_code,
                                   const ProcessFilter* filter);
 
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index e148f11..a6e816a 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -1227,14 +1227,10 @@ bool WaitForProcessesToExit(const FilePath::StringType& executable_name,
 }
 
 bool CleanupProcesses(const FilePath::StringType& executable_name,
-                      int64 wait_milliseconds,
+                      base::TimeDelta wait,
                       int exit_code,
                       const ProcessFilter* filter) {
-  bool exited_cleanly =
-      WaitForProcessesToExit(
-          executable_name,
-          base::TimeDelta::FromMilliseconds(wait_milliseconds),
-          filter);
+  bool exited_cleanly = WaitForProcessesToExit(executable_name, wait, filter);
   if (!exited_cleanly)
     KillProcesses(executable_name, exit_code, filter);
   return exited_cleanly;
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 313b187..c5ba392 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -619,13 +619,10 @@ bool WaitForSingleProcess(ProcessHandle handle, base::TimeDelta wait) {
 }
 
 bool CleanupProcesses(const FilePath::StringType& executable_name,
-                      int64 wait_milliseconds,
+                      base::TimeDelta wait,
                       int exit_code,
                       const ProcessFilter* filter) {
-  bool exited_cleanly = WaitForProcessesToExit(
-      executable_name,
-      base::TimeDelta::FromMilliseconds(wait_milliseconds),
-      filter);
+  bool exited_cleanly = WaitForProcessesToExit(executable_name, wait, filter);
   if (!exited_cleanly)
     KillProcesses(executable_name, exit_code, filter);
   return exited_cleanly;
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 788d793..51b9717 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -187,9 +187,9 @@ void CloseAllChromeProcesses() {
       window = FindWindowEx(NULL, window, wnd_class.c_str(), NULL);
       if (!SendMessageTimeout(tmpWnd, WM_CLOSE, 0, 0, SMTO_BLOCK, 3000, NULL) &&
           (GetLastError() == ERROR_TIMEOUT)) {
-        base::CleanupProcesses(installer::kChromeExe, 0,
+        base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
                                content::RESULT_CODE_HUNG, NULL);
-        base::CleanupProcesses(installer::kNaClExe, 0,
+        base::CleanupProcesses(installer::kNaClExe, base::TimeDelta(),
                                content::RESULT_CODE_HUNG, NULL);
         return;
       }
@@ -199,9 +199,11 @@ void CloseAllChromeProcesses() {
   // If asking politely didn't work, wait for 15 seconds and then kill all
   // chrome.exe. This check is just in case Chrome is ignoring WM_CLOSE
   // messages.
-  base::CleanupProcesses(installer::kChromeExe, 15000,
+  base::CleanupProcesses(installer::kChromeExe,
+                         base::TimeDelta::FromSeconds(15),
                          content::RESULT_CODE_HUNG, NULL);
-  base::CleanupProcesses(installer::kNaClExe, 15000,
+  base::CleanupProcesses(installer::kNaClExe,
+                         base::TimeDelta::FromSeconds(15),
                          content::RESULT_CODE_HUNG, NULL);
 }
 
@@ -236,7 +238,7 @@ void CloseChromeFrameHelperProcess() {
 
   if (kill) {
     VLOG(1) << installer::kChromeFrameHelperExe << " hung.  Killing.";
-    base::CleanupProcesses(installer::kChromeFrameHelperExe, 0,
+    base::CleanupProcesses(installer::kChromeFrameHelperExe, base::TimeDelta(),
                            content::RESULT_CODE_HUNG, NULL);
   }
 }
diff --git a/chrome/test/mini_installer_test/installer_test_util.cc b/chrome/test/mini_installer_test/installer_test_util.cc
index a9c6d59..087df7e 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;
 }
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index a0b128f..e10205e 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -204,7 +204,7 @@ TEST_F(MiniInstallTest, RepairFolderOnFullUser) {
       full_installer_, SwitchBuilder().AddChrome()));
   ASSERT_TRUE(installer_test::ValidateInstall(false,
       InstallationValidator::CHROME_SINGLE, provider_->GetCurrentBuild()));
-  base::CleanupProcesses(installer::kChromeExe, 0,
+  base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
                          content::RESULT_CODE_HUNG, NULL);
   ASSERT_TRUE(installer_test::DeleteInstallDirectory(
       false, // system level
@@ -220,7 +220,7 @@ TEST_F(MiniInstallTest, RepairFolderOnFullSys) {
       SwitchBuilder().AddChrome().AddSystemInstall()));
   ASSERT_TRUE(installer_test::ValidateInstall(true,
       InstallationValidator::CHROME_SINGLE, provider_->GetCurrentBuild()));
-  base::CleanupProcesses(installer::kChromeExe, 0,
+  base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
                          content::RESULT_CODE_HUNG, NULL);
   ASSERT_TRUE(installer_test::DeleteInstallDirectory(
       true, // system level
@@ -237,7 +237,7 @@ TEST_F(MiniInstallTest, RepairRegistryOnFullUser) {
       full_installer_, SwitchBuilder().AddChrome()));
   ASSERT_TRUE(installer_test::ValidateInstall(false,
       InstallationValidator::CHROME_SINGLE, provider_->GetCurrentBuild()));
-  base::CleanupProcesses(installer::kChromeExe, 0,
+  base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
                          content::RESULT_CODE_HUNG, NULL);
   ASSERT_TRUE(installer_test::DeleteRegistryKey(
       false, // system level