chrome/test/automation/proxy_launcher.cc - Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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, 9 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

« chrome/test/automation/automation_proxy.cc ('K') | « chrome/test/automation/automation_proxy.cc ('k') | chrome/test/pyautolib/pyautolib.h » ('j') | chrome/test/pyautolib/pyautolib.i » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/automation/proxy_launcher.cc

===================================================================

--- chrome/test/automation/proxy_launcher.cc (revision 78587)

+++ 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);

}

@@ -527,7 +527,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)

« chrome/test/automation/automation_proxy.cc ('K') | « chrome/test/automation/automation_proxy.cc ('k') | chrome/test/pyautolib/pyautolib.h » ('j') | chrome/test/pyautolib/pyautolib.i » ('J')