Remove uses of WaitForExitCodeWithTimeout

chrome/installer/util/google_update_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/google_update_util.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 77 matching lines @@
 // Returns false if command execution fails to execute, or times out.
 bool LaunchProcessAndWaitWithTimeout(const base::string16& cmd_string,
                                      base::TimeDelta timeout) {
   bool success = false;
   int exit_code = 0;
   VLOG(0) << "Launching: " << cmd_string;
   base::Process process =
       base::LaunchProcess(cmd_string, base::LaunchOptions());
   if (!process.IsValid()) {
     PLOG(ERROR) << "Failed to launch (" << cmd_string << ")";
-  } else if (!base::WaitForExitCodeWithTimeout(process.Handle(), &exit_code,
-                                               timeout)) {
+  } else if (!process.WaitForExitWithTimeout(timeout, &exit_code)) {
     // The GetExitCodeProcess failed or timed-out.
     LOG(ERROR) <<"Command (" << cmd_string << ") is taking more than "
                << timeout.InMilliseconds() << " milliseconds to complete.";
   } else if (exit_code != 0) {
     LOG(ERROR) << "Command (" << cmd_string << ") exited with code "
                << exit_code;
   } else {
     success = true;
   }
   return success;
@@ skipping 71 matching lines @@
 
   if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
       base::win::UserAccountControlIsEnabled()) {
     base::LaunchElevatedProcess(cmd, launch_options);
   } else {
     base::LaunchProcess(cmd, launch_options);
   }
 }
 
 }  // namespace google_update