Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2870)

Unified Diff: chrome/test/automation/proxy_launcher.cc

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/browser_proxy.cc ('k') | chrome/test/functional/downloads.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/proxy_launcher.cc
===================================================================
--- chrome/test/automation/proxy_launcher.cc (revision 80714)
+++ chrome/test/automation/proxy_launcher.cc (working copy)
@@ -133,7 +133,7 @@
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);
@@ -142,7 +142,7 @@
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);
}
@@ -542,7 +542,7 @@
// 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)
« no previous file with comments | « chrome/test/automation/browser_proxy.cc ('k') | chrome/test/functional/downloads.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698