| Index: chrome/test/chromedriver/chrome/devtools_client_impl.h
|
| diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl.h b/chrome/test/chromedriver/chrome/devtools_client_impl.h
|
| index f07e5e15f672f30cefc85f2a11b377b13b3fb1d2..30b9115df5365e45ec4152ac2e9c6eb28e237f74 100644
|
| --- a/chrome/test/chromedriver/chrome/devtools_client_impl.h
|
| +++ b/chrome/test/chromedriver/chrome/devtools_client_impl.h
|
| @@ -87,6 +87,10 @@ class DevToolsClientImpl : public DevToolsClient {
|
| Status SendCommand(
|
| const std::string& method,
|
| const base::DictionaryValue& params) override;
|
| + Status SendCommandWithTimeout(
|
| + const std::string& method,
|
| + const base::DictionaryValue& params,
|
| + const Timeout* timeout) override;
|
| Status SendAsyncCommand(
|
| const std::string& method,
|
| const base::DictionaryValue& params) override;
|
| @@ -94,9 +98,14 @@ class DevToolsClientImpl : public DevToolsClient {
|
| const std::string& method,
|
| const base::DictionaryValue& params,
|
| scoped_ptr<base::DictionaryValue>* result) override;
|
| + Status SendCommandAndGetResultWithTimeout(
|
| + const std::string& method,
|
| + const base::DictionaryValue& params,
|
| + const Timeout* timeout,
|
| + scoped_ptr<base::DictionaryValue>* result) override;
|
| void AddListener(DevToolsEventListener* listener) override;
|
| Status HandleEventsUntil(const ConditionalFunc& conditional_func,
|
| - const base::TimeDelta& timeout) override;
|
| + const Timeout& timeout) override;
|
| Status HandleReceivedEvents() override;
|
|
|
| private:
|
| @@ -125,8 +134,9 @@ class DevToolsClientImpl : public DevToolsClient {
|
| const std::string& method,
|
| const base::DictionaryValue& params,
|
| scoped_ptr<base::DictionaryValue>* result,
|
| - bool wait_for_response);
|
| - Status ProcessNextMessage(int expected_id, const base::TimeDelta& timeout);
|
| + bool wait_for_response,
|
| + const Timeout* timeout);
|
| + Status ProcessNextMessage(int expected_id, const Timeout& timeout);
|
| Status ProcessEvent(const internal::InspectorEvent& event);
|
| Status ProcessCommandResponse(
|
| const internal::InspectorCommandResponse& response);
|
|
|