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

Unified Diff: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.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/test/automation/proxy_launcher.cc ('k') | tools/heapcheck/chrome_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
index e240d133e9d1966d13572f534f590b3ca386140f..59e3ad232472cb2711357b535a75d4b3e7586898 100644
--- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
+++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
@@ -58,6 +58,6 @@ TEST_F(FastShutdown, MAYBE_SlowTermination) {
int exit_code = -1;
ASSERT_TRUE(launcher_->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.
}
« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | tools/heapcheck/chrome_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698