Index: third_party/WebKit/Source/web/tests/FrameTestHelpers.h |
diff --git a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h |
index adba60b772bb802390f1611a581d987b0db876b4..aa62a0bcb330dc6b5678d8e1e7fe7a2e23611f64 100644 |
--- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h |
+++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h |
@@ -59,6 +59,7 @@ enum class WebCachePolicy; |
namespace FrameTestHelpers { |
class TestWebFrameClient; |
+using TestWebWidgetClient = WebWidgetClient; |
// Loads a url into the specified WebFrame for testing purposes. Pumps any |
// pending resource requests, as well as waiting for the threaded parser to |
@@ -142,14 +143,14 @@ public: |
// Creates and initializes the WebView. Implicitly calls reset() first. If |
// a WebFrameClient or a WebViewClient are passed in, they must outlive the |
// WebViewHelper. |
- WebViewImpl* initializeWithOpener(WebFrame* opener, bool enableJavascript = false, TestWebFrameClient* = nullptr, TestWebViewClient* = nullptr, void (*updateSettingsFunc)(WebSettings*) = nullptr); |
+ WebViewImpl* initializeWithOpener(WebFrame* opener, bool enableJavascript = false, TestWebFrameClient* = nullptr, TestWebViewClient* = nullptr, TestWebWidgetClient* = nullptr, void (*updateSettingsFunc)(WebSettings*) = nullptr); |
// Same as initializeWithOpener(), but always sets the opener to null. |
- WebViewImpl* initialize(bool enableJavascript = false, TestWebFrameClient* = 0, TestWebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0); |
+ WebViewImpl* initialize(bool enableJavascript = false, TestWebFrameClient* = nullptr, TestWebViewClient* = nullptr, TestWebWidgetClient* = nullptr, void (*updateSettingsFunc)(WebSettings*) = 0); |
// Same as initialize() but also performs the initial load of the url. Only |
// returns once the load is complete. |
- WebViewImpl* initializeAndLoad(const std::string& url, bool enableJavascript = false, TestWebFrameClient* = 0, TestWebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0); |
+ WebViewImpl* initializeAndLoad(const std::string& url, bool enableJavascript = false, TestWebFrameClient* = nullptr, TestWebViewClient* = nullptr, TestWebWidgetClient* = nullptr, void (*updateSettingsFunc)(WebSettings*) = 0); |
void resize(WebSize); |