GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms

chrome/test/automation/proxy_launcher.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 "chrome/test/automation/proxy_launcher.h"
 
 #include "app/sql/connection.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 284 matching lines @@
 
   // Now, drop the automation IPC channel so that the automation provider in
   // the browser notices and drops its reference to the browser process.
   if (automation_proxy_.get())
     automation_proxy_->Disconnect();
 
   // Wait for the browser process to quit. It should quit once all tabs have
   // been closed.
   int exit_code = -1;
   EXPECT_TRUE(WaitForBrowserProcessToQuit(
-                  TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code));
+                  TestTimeouts::action_max_timeout_ms(), &exit_code));
   EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
 
   browser_quit_time_ = base::TimeTicks::Now() - quit_start;
 }
 
 void ProxyLauncher::TerminateBrowser() {
   // If we have already finished waiting for the browser to exit
   // (or it hasn't launched at all), there's nothing to do here.
   if (process_ == base::kNullProcessHandle)
     return;
@@ skipping 11 matching lines @@
   // the browser notices and drops its reference to the browser process.
   if (automation_proxy_.get())
     automation_proxy_->Disconnect();
 
 #if defined(OS_POSIX)
   EXPECT_EQ(kill(process_, SIGTERM), 0);
 #endif  // OS_POSIX
 
   int exit_code = -1;
   EXPECT_TRUE(WaitForBrowserProcessToQuit(
-                  TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code));
+                  TestTimeouts::action_max_timeout_ms(), &exit_code));
   EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
 
   browser_quit_time_ = base::TimeTicks::Now() - quit_start;
 }
 
 void ProxyLauncher::AssertAppNotRunning(const std::wstring& error_message) {
   std::wstring final_error_message(error_message);
 
   ChromeProcessList processes = GetRunningChromeProcesses(process_id_);
   if (!processes.empty()) {
@@ skipping 265 matching lines @@
   ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads));
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }