| Index: chrome/test/chromedriver/chrome/stub_web_view.h
|
| diff --git a/chrome/test/chromedriver/chrome/stub_web_view.h b/chrome/test/chromedriver/chrome/stub_web_view.h
|
| index 006caa4b8a9e34aa20a46e5586b554aef6099a06..710b4b5b8201622a2cf25f286f84a7f57d1f73ab 100644
|
| --- a/chrome/test/chromedriver/chrome/stub_web_view.h
|
| +++ b/chrome/test/chromedriver/chrome/stub_web_view.h
|
| @@ -23,7 +23,7 @@ class StubWebView : public WebView {
|
| Status ConnectIfNecessary() override;
|
| Status HandleReceivedEvents() override;
|
| Status GetUrl(std::string* url) override;
|
| - Status Load(const std::string& url) override;
|
| + Status Load(const std::string& url, const Timeout* timeout) override;
|
| Status Reload() override;
|
| Status TraverseHistory(int delta) override;
|
| Status EvaluateScript(const std::string& frame,
|
| @@ -55,9 +55,10 @@ class StubWebView : public WebView {
|
| Status GetCookies(std::unique_ptr<base::ListValue>* cookies) override;
|
| Status DeleteCookie(const std::string& name, const std::string& url) override;
|
| Status WaitForPendingNavigations(const std::string& frame_id,
|
| - const base::TimeDelta& timeout,
|
| + const Timeout& timeout,
|
| bool stop_load_on_timeout) override;
|
| Status IsPendingNavigation(const std::string& frame_id,
|
| + const Timeout* timeout,
|
| bool* is_pending) override;
|
| JavaScriptDialogManager* GetJavaScriptDialogManager() override;
|
| Status OverrideGeolocation(const Geoposition& geoposition) override;
|
|
|