GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms

chrome/browser/service/service_process_control_browsertest.cc

 // Copyright (c) 2011 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 "base/process_util.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/service/service_process_control_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_version_info.h"
@@ skipping 56 matching lines @@
   void Disconnect() {
     // This will delete all instances of ServiceProcessControl and close the IPC
     // connections.
     ServiceProcessControlManager::GetInstance()->Shutdown();
     process_ = NULL;
   }
 
   void WaitForShutdown() {
     EXPECT_TRUE(base::WaitForSingleProcess(
         service_process_handle_,
-        TestTimeouts::wait_for_terminate_timeout_ms()));
+        TestTimeouts::action_max_timeout_ms()));
   }
 
   void ProcessControlLaunched() {
     base::ProcessId service_pid;
     EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
     EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
     EXPECT_TRUE(base::OpenProcessHandleWithAccess(
         service_pid,
         base::kProcessAccessWaitForTermination,
         &service_process_handle_));
@@ skipping 155 matching lines @@
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_CheckPid) {
   base::ProcessId service_pid;
   EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid));
   // Launch the service process.
   LaunchServiceProcessControl();
   EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
   EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest);