Remove base::WaitForSingleProcess

chrome/browser/service_process/service_process_control_browsertest.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/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 62 matching lines @@
   }
 
   virtual void TearDown() override {
     if (ServiceProcessControl::GetInstance()->IsConnected())
       EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 #if defined(OS_MACOSX)
     // ForceServiceProcessShutdown removes the process from launched on Mac.
     ForceServiceProcessShutdown("", 0);
 #endif  // OS_MACOSX
     if (service_process_.IsValid()) {
-      EXPECT_TRUE(base::WaitForSingleProcess(
-          service_process_.Handle(),
-          TestTimeouts::action_max_timeout()));
+      int exit_code;
+      EXPECT_TRUE(service_process_.WaitForExitWithTimeout(
+          TestTimeouts::action_max_timeout(), &exit_code));
+      EXPECT_EQ(0, exit_code);
       service_process_.Close();
     }
   }
 
   void ProcessControlLaunched() {
     base::ProcessId service_pid;
     EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
     EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
 #if defined(OS_WIN)
     service_process_ =
@@ skipping 185 matching lines @@
   // Callback should not be called during GetHistograms call.
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   // Wait for real callback by providing large timeout value.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                 base::Unretained(this)),
       base::TimeDelta::FromHours(1)));
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1);
   content::RunMessageLoop();
 }