Remove base::WaitForSingleProcess

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

 // Copyright 2014 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/switches.h"
 #include "base/auto_reset.h"
@@ skipping 407 matching lines @@
 
     ASSERT_TRUE(GetFirstHostedAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
     pid_t shim_pid;
     EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
     GetFirstHostedAppWindow()->window()->Close();
     // Wait for the window to be closed.
     listener.WaitUntilRemoved();
-    ASSERT_TRUE(
-        base::WaitForSingleProcess(shim_pid, TestTimeouts::action_timeout()));
+    base::Process shim_process(shim_pid);
+    int exit_code;
+    ASSERT_TRUE(shim_process.WaitForExitWithTimeout(
+                    TestTimeouts::action_timeout(), &exit_code));
 
     EXPECT_FALSE(GetFirstHostedAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 }
 
 // Test that launching the shim for an app starts the app, and vice versa.
 // These two cases are combined because the time to run the test is dominated
 // by loading the extension and creating the shim.
 IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_Launch) {
@@ skipping 50 matching lines @@
         shim_path, shim_cmdline, kLSLaunchDefaults, &shim_psn));
     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
     ASSERT_TRUE(GetFirstAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
     pid_t shim_pid;
     EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
     GetFirstAppWindow()->GetBaseWindow()->Close();
-    ASSERT_TRUE(
-        base::WaitForSingleProcess(shim_pid, TestTimeouts::action_timeout()));
+    base::Process shim_process(shim_pid);
+    int exit_code;
+    ASSERT_TRUE(shim_process.WaitForExitWithTimeout(
+                    TestTimeouts::action_timeout(), &exit_code));
 
     EXPECT_FALSE(GetFirstAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 }
 
 // Test that the shim's lifetime depends on the visibility of windows. I.e. the
 // shim is only active when there are visible windows.
 IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_ShowWindow) {
   const extensions::Extension* app = InstallPlatformApp("hidden");
@@ skipping 194 matching lines @@
   // the shim is rebuilt.
   WindowedAppShimLaunchObserver(app->id()).Wait();
 
   EXPECT_TRUE(GetFirstAppWindow());
   EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 }
 
 #endif  // defined(ARCH_CPU_64_BITS)
 
 }  // namespace apps