summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/proxy_launcher.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/automation/proxy_launcher.h')
-rw-r--r--chrome/test/automation/proxy_launcher.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h
index 642c539..505c65d 100644
--- a/chrome/test/automation/proxy_launcher.h
+++ b/chrome/test/automation/proxy_launcher.h
@@ -122,13 +122,10 @@ class ProxyLauncher {
// window or if the browser process died by itself.
bool IsBrowserRunning();
- // Returns true when timeout_ms milliseconds have elapsed.
- // Returns false if the browser process died while waiting.
- bool CrashAwareSleep(int timeout_ms);
-
// Wait for the browser process to shut down on its own (i.e. as a result of
- // some action that your test has taken).
- bool WaitForBrowserProcessToQuit(int timeout);
+ // some action that your test has taken). If it has exited within |timeout|,
+ // puts the exit code in |exit_code| and returns true.
+ bool WaitForBrowserProcessToQuit(int timeout, int* exit_code);
AutomationProxy* automation() const;