content/browser/frame_host/render_frame_host_manager_unittest.cc - Issue 2797813002: Replicate feature policy container policies.

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 2797813002: Replicate feature policy container policies. (Closed)

Patch Set: Cleanup, reponding to review comments Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« content/browser/frame_host/render_frame_host_manager.cc ('K') | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/frame_host/render_frame_message_filter.cc » ('j') | content/common/feature_policy/feature_policy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b82b68efb9cf5523402d7aa15db1d236a4b990eb..06e8867896e02d3426171f28ec053805fe209d37 100644

--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc

+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc

@@ -1944,11 +1944,13 @@ TEST_F(RenderFrameHostManagerTestWithSiteIsolation, DetachPendingChild) {

contents()->GetMainFrame()->OnCreateChildFrame(

contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame_name", "uniqueName1",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

contents()->GetMainFrame()->OnCreateChildFrame(

contents()->GetMainFrame()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame_name", "uniqueName2",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

RenderFrameHostManager* root_manager =

contents()->GetFrameTree()->root()->render_manager();

RenderFrameHostManager* iframe1 =

@@ -2083,7 +2085,8 @@ TEST_F(RenderFrameHostManagerTestWithSiteIsolation,

contents1->GetMainFrame()->OnCreateChildFrame(

contents1->GetMainFrame()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame_name", "uniqueName1",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

RenderFrameHostManager* iframe =

contents()->GetFrameTree()->root()->child_at(0)->render_manager();

NavigationEntryImpl entry(NULL /* instance */, kUrl2,

@@ -2132,6 +2135,7 @@ TEST_F(RenderFrameHostManagerTestWithSiteIsolation,

main_rfh->OnCreateChildFrame(main_rfh->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, std::string(),

"uniqueName1", blink::WebSandboxFlags::None,

+ ParsedFeaturePolicyHeader(),

FrameOwnerProperties());

RenderFrameHostManager* subframe_rfhm =

contents()->GetFrameTree()->root()->child_at(0)->render_manager();

@@ -2290,10 +2294,10 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) {

int process_id = root1->current_frame_host()->GetProcess()->GetID();

tree1->AddFrame(root1, process_id, 12, blink::WebTreeScopeType::Document,

std::string(), "uniqueName0", blink::WebSandboxFlags::None,

- FrameOwnerProperties());

+ ParsedFeaturePolicyHeader(), FrameOwnerProperties());

tree1->AddFrame(root1, process_id, 13, blink::WebTreeScopeType::Document,

std::string(), "uniqueName1", blink::WebSandboxFlags::None,

- FrameOwnerProperties());

+ ParsedFeaturePolicyHeader(), FrameOwnerProperties());

std::unique_ptr<TestWebContents> tab2(

TestWebContents::Create(browser_context(), nullptr));

@@ -2303,10 +2307,10 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) {

process_id = root2->current_frame_host()->GetProcess()->GetID();

tree2->AddFrame(root2, process_id, 22, blink::WebTreeScopeType::Document,

std::string(), "uniqueName2", blink::WebSandboxFlags::None,

- FrameOwnerProperties());

+ ParsedFeaturePolicyHeader(), FrameOwnerProperties());

tree2->AddFrame(root2, process_id, 23, blink::WebTreeScopeType::Document,

std::string(), "uniqueName3", blink::WebSandboxFlags::None,

- FrameOwnerProperties());

+ ParsedFeaturePolicyHeader(), FrameOwnerProperties());

std::unique_ptr<TestWebContents> tab3(

TestWebContents::Create(browser_context(), nullptr));

@@ -2321,7 +2325,7 @@ TEST_F(RenderFrameHostManagerTest, TraverseComplexOpenerChain) {

process_id = root4->current_frame_host()->GetProcess()->GetID();

tree4->AddFrame(root4, process_id, 42, blink::WebTreeScopeType::Document,

std::string(), "uniqueName4", blink::WebSandboxFlags::None,

- FrameOwnerProperties());

+ ParsedFeaturePolicyHeader(), FrameOwnerProperties());

root1->child_at(1)->SetOpener(root1->child_at(1));

root1->SetOpener(root2->child_at(1));

@@ -2370,15 +2374,18 @@ TEST_F(RenderFrameHostManagerTest, PageFocusPropagatesToSubframeProcesses) {

main_test_rfh()->OnCreateChildFrame(

main_test_rfh()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame1", "uniqueName1",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

main_test_rfh()->OnCreateChildFrame(

main_test_rfh()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame2", "uniqueName2",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

main_test_rfh()->OnCreateChildFrame(

main_test_rfh()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame3", "uniqueName3",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

FrameTreeNode* root = contents()->GetFrameTree()->root();

RenderFrameHostManager* child1 = root->child_at(0)->render_manager();

@@ -2468,7 +2475,8 @@ TEST_F(RenderFrameHostManagerTest,

main_test_rfh()->OnCreateChildFrame(

main_test_rfh()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame1", "uniqueName1",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

FrameTreeNode* root = contents()->GetFrameTree()->root();

RenderFrameHostManager* child = root->child_at(0)->render_manager();

@@ -3012,7 +3020,8 @@ TEST_F(RenderFrameHostManagerTestWithSiteIsolation,

main_test_rfh()->OnCreateChildFrame(

main_test_rfh()->GetProcess()->GetNextRoutingID(),

blink::WebTreeScopeType::Document, "frame1", "uniqueName1",

- blink::WebSandboxFlags::None, FrameOwnerProperties());

+ blink::WebSandboxFlags::None, ParsedFeaturePolicyHeader(),

+ FrameOwnerProperties());

FrameTreeNode* root = contents()->GetFrameTree()->root();

RenderFrameHostManager* child = root->child_at(0)->render_manager();