diff options
| author | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 19:41:56 +0000 |
|---|---|---|
| committer | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 19:41:56 +0000 |
| commit | a0b900be2e35012f904a15ed278f31124c4b955e (patch) | |
| tree | 5218149018d4d4db6640d8d6f05ac23edef3bd60 /chrome/test/automation/javascript_execution_controller.h | |
| parent | 1e9db21babb70b7d861ad65a09d96ced486ab513 (diff) | |
| download | chromium_src-a0b900be2e35012f904a15ed278f31124c4b955e.zip chromium_src-a0b900be2e35012f904a15ed278f31124c4b955e.tar.gz chromium_src-a0b900be2e35012f904a15ed278f31124c4b955e.tar.bz2 | |
Switch to TimeDelta interfaces in chrome automation test infrastructure.
This is a resubmit of a previously reverted commit:
https://chromiumcodereview.appspot.com/10736064/
BUG=108171
Review URL: https://chromiumcodereview.appspot.com/10787010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/javascript_execution_controller.h')
| -rw-r--r-- | chrome/test/automation/javascript_execution_controller.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/automation/javascript_execution_controller.h b/chrome/test/automation/javascript_execution_controller.h index 90fa6b7..db78db9 100644 --- a/chrome/test/automation/javascript_execution_controller.h +++ b/chrome/test/automation/javascript_execution_controller.h @@ -10,6 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time.h" #include "base/values.h" #include "chrome/test/automation/javascript_message_utils.h" @@ -71,7 +72,9 @@ class JavaScriptExecutionController // Sets a timeout to be used for all JavaScript methods in which a response // is returned asynchronously. - static void set_timeout(int timeout_ms) { timeout_ms_ = timeout_ms; } + static void set_timeout(base::TimeDelta timeout) { + timeout_ms_ = timeout.InMilliseconds(); + } protected: virtual ~JavaScriptExecutionController(); |