| Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
|
| index 7aeae023ddddc7a24abd700e9af6487f7f33c7c1..cf4a9b9001102aa0af424d5888ea947631cf9843 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
|
| @@ -2207,7 +2207,7 @@ TEST_F(WebViewTest, SmartClipReturnsEmptyStringsWhenUserSelectIsNone)
|
| class CreateChildCounterFrameClient : public FrameTestHelpers::TestWebFrameClient {
|
| public:
|
| CreateChildCounterFrameClient() : m_count(0) { }
|
| - WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& frameName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
|
| + WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& frameName, const WebString& frameUniqueName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
|
|
|
| int count() const { return m_count; }
|
|
|
| @@ -2215,10 +2215,10 @@ private:
|
| int m_count;
|
| };
|
|
|
| -WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| +WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, const WebString& frameUniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| {
|
| ++m_count;
|
| - return TestWebFrameClient::createChildFrame(parent, scope, frameName, sandboxFlags, frameOwnerProperties);
|
| + return TestWebFrameClient::createChildFrame(parent, scope, frameName, frameUniqueName, sandboxFlags, frameOwnerProperties);
|
| }
|
|
|
| TEST_F(WebViewTest, ChangeDisplayMode)
|
|
|