Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/proxy_launcher.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 114 matching lines @@
   else
     base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
 
   EXPECT_TRUE(automation()->SetFilteredInet(ShouldFilterInet()));
 }
 
 void ProxyLauncher::LaunchBrowserAndServer(const LaunchState& state,
                                            bool wait_for_initial_loads) {
   // Set up IPC testing interface as a server.
   automation_proxy_.reset(CreateAutomationProxy(
-                              TestTimeouts::command_execution_timeout_ms()));
+                              TestTimeouts::action_max_timeout_ms()));
 
   LaunchBrowser(state);
   WaitForBrowserLaunch(wait_for_initial_loads);
 }
 
 void ProxyLauncher::ConnectToRunningBrowser(bool wait_for_initial_loads) {
   // Set up IPC testing interface as a client.
   automation_proxy_.reset(CreateAutomationProxy(
-                              TestTimeouts::command_execution_timeout_ms()));
+                              TestTimeouts::action_max_timeout_ms()));
   WaitForBrowserLaunch(wait_for_initial_loads);
 }
 
 void ProxyLauncher::CloseBrowserAndServer() {
   QuitBrowser();
   CleanupAppProcesses();
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
@@ skipping 364 matching lines @@
     // make sure there isn't one already there before browser launch.
     EXPECT_TRUE(file_util::Delete(testing_channel_path, false));
 
     // Set up IPC testing interface as a client.
     LaunchBrowser(state);
   }
 
   // Wait for browser to be ready for connections.
   bool testing_channel_exists = false;
   for (int wait_time = 0;
-       wait_time < TestTimeouts::command_execution_timeout_ms();
+       wait_time < TestTimeouts::action_max_timeout_ms();
        wait_time += automation::kSleepTime) {
     testing_channel_exists = file_util::PathExists(testing_channel_path);
     if (testing_channel_exists)
       break;
     base::PlatformThread::Sleep(automation::kSleepTime);
   }
   EXPECT_TRUE(testing_channel_exists);
 
   ConnectToRunningBrowser(wait_for_initial_loads);
 }
@@ skipping 31 matching lines @@
   LaunchBrowserAndServer(state, wait_for_initial_loads);
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }