Index: chrome/test/chromedriver/chrome/devtools_client.h |
diff --git a/chrome/test/chromedriver/chrome/devtools_client.h b/chrome/test/chromedriver/chrome/devtools_client.h |
index 32aeb810bdd98e920a9a58f254c52d64e36fe279..9365830d53d75e0aff6a7e8b0af400c684642477 100644 |
--- a/chrome/test/chromedriver/chrome/devtools_client.h |
+++ b/chrome/test/chromedriver/chrome/devtools_client.h |
@@ -12,10 +12,10 @@ |
namespace base { |
class DictionaryValue; |
-class TimeDelta; |
} |
class DevToolsEventListener; |
+class Timeout; |
class Status; |
// A DevTools client of a single DevTools debugger. |
@@ -36,6 +36,11 @@ class DevToolsClient { |
const std::string& method, |
const base::DictionaryValue& params) = 0; |
+ virtual Status SendCommandWithTimeout( |
+ const std::string& method, |
+ const base::DictionaryValue& params, |
+ const Timeout* timeout) = 0; |
+ |
virtual Status SendAsyncCommand( |
const std::string& method, |
const base::DictionaryValue& params) = 0; |
@@ -45,6 +50,12 @@ class DevToolsClient { |
const base::DictionaryValue& params, |
std::unique_ptr<base::DictionaryValue>* result) = 0; |
+ virtual Status SendCommandAndGetResultWithTimeout( |
+ const std::string& method, |
+ const base::DictionaryValue& params, |
+ const Timeout* timeout, |
+ std::unique_ptr<base::DictionaryValue>* result) = 0; |
+ |
// Adds a listener. This must only be done when the client is disconnected. |
virtual void AddListener(DevToolsEventListener* listener) = 0; |
@@ -54,7 +65,7 @@ class DevToolsClient { |
// If the condition is not met within |timeout|, kTimeout status |
// is returned eventually. If |timeout| is 0, this function will not block. |
virtual Status HandleEventsUntil(const ConditionalFunc& conditional_func, |
- const base::TimeDelta& timeout) = 0; |
+ const Timeout& timeout) = 0; |
// Handles events that have been received but not yet handled. |
virtual Status HandleReceivedEvents() = 0; |