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

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

Issue 10787010: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 5 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/javascript_execution_controller.h ('k') | chrome/test/automation/proxy_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/proxy_launcher.h
diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h
index d6886e1801720c7078a0731973bd3c96ee2e6cf9..a9924598ad32026ffea38e41d6dbbccb1e1180f0 100644
--- a/chrome/test/automation/proxy_launcher.h
+++ b/chrome/test/automation/proxy_launcher.h
@@ -105,7 +105,7 @@ class ProxyLauncher {
// Wait for the browser process to shut down on its own (i.e. as a result of
// 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);
+ bool WaitForBrowserProcessToQuit(base::TimeDelta timeout, int* exit_code);
AutomationProxy* automation() const;
@@ -134,7 +134,7 @@ class ProxyLauncher {
protected:
// Creates an automation proxy.
virtual AutomationProxy* CreateAutomationProxy(
- int execution_timeout) = 0;
+ base::TimeDelta execution_timeout) = 0;
// Returns the automation proxy's channel with any prefixes prepended,
// for passing as a command line parameter over to the browser.
@@ -218,7 +218,8 @@ class NamedProxyLauncher : public ProxyLauncher {
NamedProxyLauncher(const std::string& channel_id,
bool launch_browser, bool disconnect_on_failure);
- virtual AutomationProxy* CreateAutomationProxy(int execution_timeout);
+ virtual AutomationProxy* CreateAutomationProxy(
+ base::TimeDelta execution_timeout);
virtual bool InitializeConnection(
const LaunchState& state,
bool wait_for_initial_loads) OVERRIDE WARN_UNUSED_RESULT;
@@ -238,7 +239,8 @@ class NamedProxyLauncher : public ProxyLauncher {
class AnonymousProxyLauncher : public ProxyLauncher {
public:
explicit AnonymousProxyLauncher(bool disconnect_on_failure);
- virtual AutomationProxy* CreateAutomationProxy(int execution_timeout);
+ virtual AutomationProxy* CreateAutomationProxy(
+ base::TimeDelta execution_timeout);
virtual bool InitializeConnection(
const LaunchState& state,
bool wait_for_initial_loads) OVERRIDE WARN_UNUSED_RESULT;
« no previous file with comments | « chrome/test/automation/javascript_execution_controller.h ('k') | chrome/test/automation/proxy_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698