Index: content/browser/frame_host/render_frame_host_manager_unittest.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
index 7785b63eccf51d513c90dded9e7223bd8b28c368..770d9bc6f54bcee6c7b5342ecd8968adfb038725 100644 |
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc |
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
@@ -44,6 +44,7 @@ |
#include "content/test/test_web_contents.h" |
#include "net/base/load_flags.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
#include "third_party/WebKit/public/web/WebSandboxFlags.h" |
#include "ui/base/page_transition_types.h" |
@@ -683,7 +684,7 @@ TEST_F(RenderFrameHostManagerTest, DropCreateChildFrameWhileSwappedOut) { |
initial_rfh->OnCreateChildFrame( |
initial_rfh->GetProcess()->GetNextRoutingID(), |
blink::WebTreeScopeType::Document, std::string(), |
- blink::WebSandboxFlags::None); |
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()); |
EXPECT_TRUE(observer.created()); |
} |
@@ -707,7 +708,7 @@ TEST_F(RenderFrameHostManagerTest, DropCreateChildFrameWhileSwappedOut) { |
initial_rfh->OnCreateChildFrame( |
initial_rfh->GetProcess()->GetNextRoutingID(), |
blink::WebTreeScopeType::Document, std::string(), |
- blink::WebSandboxFlags::None); |
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()); |
EXPECT_FALSE(observer.created()); |
} |
} |
@@ -2074,11 +2075,11 @@ TEST_F(RenderFrameHostManagerTest, DetachPendingChild) { |
contents()->GetMainFrame()->OnCreateChildFrame( |
contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(), |
blink::WebTreeScopeType::Document, "frame_name", |
- blink::WebSandboxFlags::None); |
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()); |
contents()->GetMainFrame()->OnCreateChildFrame( |
contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(), |
blink::WebTreeScopeType::Document, "frame_name", |
- blink::WebSandboxFlags::None); |
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()); |
RenderFrameHostManager* root_manager = |
contents()->GetFrameTree()->root()->render_manager(); |
RenderFrameHostManager* iframe1 = |
@@ -2216,7 +2217,7 @@ TEST_F(RenderFrameHostManagerTest, TwoTabsCrashOneReloadsOneLeaves) { |
contents1->GetMainFrame()->OnCreateChildFrame( |
contents1->GetMainFrame()->GetProcess()->GetNextRoutingID(), |
blink::WebTreeScopeType::Document, "frame_name", |
- blink::WebSandboxFlags::None); |
+ blink::WebSandboxFlags::None, blink::WebFrameOwnerProperties()); |
RenderFrameHostManager* iframe = |
contents()->GetFrameTree()->root()->child_at(0)->render_manager(); |
NavigationEntryImpl entry(NULL /* instance */, -1 /* page_id */, kUrl2, |
@@ -2376,9 +2377,11 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) { |
FrameTreeNode* root1 = tree1->root(); |
int process_id = root1->current_frame_host()->GetProcess()->GetID(); |
tree1->AddFrame(root1, process_id, 12, blink::WebTreeScopeType::Document, |
- std::string(), blink::WebSandboxFlags::None); |
+ std::string(), blink::WebSandboxFlags::None, |
+ blink::WebFrameOwnerProperties()); |
tree1->AddFrame(root1, process_id, 13, blink::WebTreeScopeType::Document, |
- std::string(), blink::WebSandboxFlags::None); |
+ std::string(), blink::WebSandboxFlags::None, |
+ blink::WebFrameOwnerProperties()); |
scoped_ptr<TestWebContents> tab2( |
TestWebContents::Create(browser_context(), nullptr)); |
@@ -2386,9 +2389,11 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) { |
FrameTreeNode* root2 = tree2->root(); |
process_id = root2->current_frame_host()->GetProcess()->GetID(); |
tree2->AddFrame(root2, process_id, 22, blink::WebTreeScopeType::Document, |
- std::string(), blink::WebSandboxFlags::None); |
+ std::string(), blink::WebSandboxFlags::None, |
+ blink::WebFrameOwnerProperties()); |
tree2->AddFrame(root2, process_id, 23, blink::WebTreeScopeType::Document, |
- std::string(), blink::WebSandboxFlags::None); |
+ std::string(), blink::WebSandboxFlags::None, |
+ blink::WebFrameOwnerProperties()); |
scoped_ptr<TestWebContents> tab3( |
TestWebContents::Create(browser_context(), nullptr)); |
@@ -2401,7 +2406,8 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) { |
FrameTreeNode* root4 = tree4->root(); |
process_id = root4->current_frame_host()->GetProcess()->GetID(); |
tree4->AddFrame(root4, process_id, 42, blink::WebTreeScopeType::Document, |
- std::string(), blink::WebSandboxFlags::None); |
+ std::string(), blink::WebSandboxFlags::None, |
+ blink::WebFrameOwnerProperties()); |
root1->child_at(1)->SetOpener(root1->child_at(1)); |
root1->SetOpener(root2->child_at(1)); |