chrome/test/automation/proxy_launcher.cc - Issue 7055007: GTTF: Remove wait_for_terminate_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 7055007: GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 7 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/browser/service/service_process_control_browsertest.cc ('k') | chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/automation/proxy_launcher.cc

diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc

index 256add6315c598a78e1f37ad0f77db59843dc8c6..6260b94aad04368d64da338633f4544e76193a35 100644

--- a/chrome/test/automation/proxy_launcher.cc

+++ b/chrome/test/automation/proxy_launcher.cc

@@ -302,7 +302,7 @@ void ProxyLauncher::QuitBrowser() {

// 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;