| 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 5850282b5d1245236d58ced6fc48398fe6776af0..7314d4472fa626bd04bd53091963005a88e4addc 100644
|
| --- a/third_party/WebKit/Source/web/tests/FrameTestHelpers.h
|
| +++ b/third_party/WebKit/Source/web/tests/FrameTestHelpers.h
|
| @@ -34,8 +34,10 @@
|
| #include "core/frame/Settings.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "platform/scroll/ScrollbarTheme.h"
|
| +#include "public/platform/WebString.h"
|
| #include "public/platform/WebURLRequest.h"
|
| #include "public/web/WebFrameClient.h"
|
| +#include "public/web/WebFrameOwnerProperties.h"
|
| #include "public/web/WebHistoryItem.h"
|
| #include "public/web/WebRemoteFrameClient.h"
|
| #include "public/web/WebViewClient.h"
|
| @@ -47,7 +49,10 @@
|
|
|
| namespace blink {
|
|
|
| +class WebFrame;
|
| class WebFrameWidget;
|
| +class WebLocalFrame;
|
| +class WebRemoteFrame;
|
| class WebRemoteFrameImpl;
|
|
|
| namespace FrameTestHelpers {
|
| @@ -70,6 +75,11 @@ void reloadFrameIgnoringCache(WebFrame*);
|
| // this. Use one of the above helpers.
|
| void pumpPendingRequestsDoNotUse(WebFrame*);
|
|
|
| +// Calls WebRemoteFrame::createLocalChild, but with some arguments prefilled
|
| +// with default test values (i.e. with a default |client| or |properties| and/or
|
| +// with a precalculated |uniqueName|).
|
| +WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name = WebString::fromUTF8("frameName"), WebFrameClient* = nullptr, WebFrame* previousSibling = nullptr, const WebFrameOwnerProperties& = WebFrameOwnerProperties());
|
| +
|
| class SettingOverrider {
|
| public:
|
| virtual void overrideSettings(WebSettings*) = 0;
|
| @@ -155,7 +165,7 @@ class TestWebFrameClient : public WebFrameClient {
|
| public:
|
| TestWebFrameClient();
|
|
|
| - WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& frameName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
|
| + WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
|
| void frameDetached(WebFrame*, DetachType) override;
|
| void didStartLoading(bool) override;
|
| void didStopLoading() override;
|
|
|