| Index: chrome/test/automation/javascript_execution_controller.h
|
| diff --git a/chrome/test/automation/javascript_execution_controller.h b/chrome/test/automation/javascript_execution_controller.h
|
| index 90fa6b775215a2d719a296ffe5a4e432c0feb4b1..db78db980f2948ea2d38402768f059d26ee78b15 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();
|
|
|