Remove base::WaitForSingleProcess

apps/load_and_launch_browsertest.cc

 // Copyright 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.
 
 // Tests for the --load-and-launch-app switch.
 // The two cases are when chrome is running and another process uses the switch
 // and when chrome is started from scratch.
 
 #include "apps/switches.h"
 #include "base/process/launch.h"
@@ skipping 44 matching lines @@
 
   new_cmdline.AppendSwitchNative(apps::kLoadAndLaunchApp,
                                  app_path.value());
 
   new_cmdline.AppendSwitch(content::kLaunchAsBrowser);
   base::Process process =
       base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest());
   ASSERT_TRUE(process.IsValid());
 
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
-  ASSERT_TRUE(base::WaitForSingleProcess(process.Handle(),
-                                         TestTimeouts::action_timeout()));
+  int exit_code;
+  ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_timeout(),
+                                             &exit_code));
 }
 
 // TODO(jackhou): Enable this test once it works on OSX. It currently does not
 // work for the same reason --app-id doesn't. See http://crbug.com/148465
 #if defined(OS_MACOSX)
 #define MAYBE_LoadAndLaunchAppWithFile DISABLED_LoadAndLaunchAppWithFile
 #else
 #define MAYBE_LoadAndLaunchAppWithFile LoadAndLaunchAppWithFile
 #endif
 
@@ skipping 18 matching lines @@
   new_cmdline.AppendSwitchNative(apps::kLoadAndLaunchApp,
                                  app_path.value());
   new_cmdline.AppendSwitch(content::kLaunchAsBrowser);
   new_cmdline.AppendArgPath(test_file_path);
 
   base::Process process =
       base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest());
   ASSERT_TRUE(process.IsValid());
 
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
-  ASSERT_TRUE(base::WaitForSingleProcess(process.Handle(),
-                                         TestTimeouts::action_timeout()));
+  int exit_code;
+  ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_timeout(),
+                                             &exit_code));
 }
 
 namespace {
 
 // TestFixture that appends --load-and-launch-app before calling BrowserMain.
 class PlatformAppLoadAndLaunchBrowserTest : public PlatformAppBrowserTest {
  protected:
   PlatformAppLoadAndLaunchBrowserTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ skipping 33 matching lines @@
         LoadAndLaunchAppChromeNotRunning
 #endif
 
 // Case where Chrome is not running.
 IN_PROC_BROWSER_TEST_F(PlatformAppLoadAndLaunchBrowserTest,
                        MAYBE_LoadAndLaunchAppChromeNotRunning) {
   LoadAndLaunchApp();
 }
 
 }  // namespace apps