[chromedriver] Apply page load timeout to slow cross-process navigations

chrome/test/chromedriver/chrome/devtools_client.h

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 884ec9e420fcd12d1f0300d17994ab2cdd725e8d..277405d8a3ae82a86f8ca02dfbfca509f3450204 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);
+
   virtual Status SendAsyncCommand(
       const std::string& method,
       const base::DictionaryValue& params) = 0;
@@ -45,6 +50,12 @@ class DevToolsClient {
       const base::DictionaryValue& params,
       scoped_ptr<base::DictionaryValue>* result) = 0;
 
+  virtual Status SendCommandAndGetResultWithTimeout(
+      const std::string& method,
+      const base::DictionaryValue& params,
+      const Timeout* timeout,
+      scoped_ptr<base::DictionaryValue>* result);
+
   // 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;