Remove uses of WaitForExitCodeWithTimeout

win8/test/metro_registration_helper.cc

 // Copyright (c) 2013 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 "win8/test/metro_registration_helper.h"
 
 #include <shlobj.h>
 
 #include <vector>
 
@@ skipping 40 matching lines @@
 
   // Perform the registration by invoking test_registrar.exe.
   base::CommandLine register_command(registrar);
   register_command.AppendArg("/RegServer");
 
   base::Process register_process =
       base::LaunchProcess(register_command.GetCommandLineString(),
                           base::LaunchOptions());
   if (register_process.IsValid()) {
     int ret = 0;
-    if (base::WaitForExitCodeWithTimeout(
-            register_process.Handle(), &ret,
-            base::TimeDelta::FromSeconds(kRegistrationTimeoutSeconds))) {
+    if (register_process.WaitForExitWithTimeout(
+            base::TimeDelta::FromSeconds(kRegistrationTimeoutSeconds), &ret)) {
       if (ret == 0) {
         return true;
       } else {
         LOG(ERROR) << "Win8 registration using "
                    << register_command.GetCommandLineString()
                    << " failed with error code " << ret;
       }
     } else {
       LOG(ERROR) << "Win8 registration using "
                  << register_command.GetCommandLineString() << " timed out.";
@@ skipping 50 matching lines @@
   std::vector<base::string16> choices;
   OpenWithDialogController controller;
   HRESULT hr = controller.RunSynchronously(
       NULL, kDefaultBrowserProtocol, win8::test::kDefaultTestExeName, &choices);
   LOG_IF(ERROR, FAILED(hr)) << std::hex << hr;
   DCHECK(IsTestDefaultForProtocol(kDefaultBrowserProtocol));
   return SUCCEEDED(hr);
 }
 
 }  // namespace win8