| Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| index 9db04746d2215b92d3f7ac5df147a4793ea9b1fa..0a334091b223dee8a04f47444f0d7ddc5359697f 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -2231,7 +2231,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());
|
| const GURL subframe_url("http://foo1/subframe");
|
| @@ -2311,7 +2311,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name0, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());
|
| const GURL url2("http://foo/2");
|
| @@ -2355,7 +2355,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name1, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe2 = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(1)->current_frame_host());
|
| const GURL url3("http://foo/3");
|
| @@ -2396,10 +2396,10 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
|
|
| // Add a nested subframe and navigate.
|
| std::string unique_name2("uniqueName2");
|
| - subframe->OnCreateChildFrame(process()->GetNextRoutingID(),
|
| - blink::WebTreeScopeType::Document, std::string(),
|
| - unique_name2, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + subframe->OnCreateChildFrame(
|
| + process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| + std::string(), unique_name2, blink::WebSandboxFlags::None,
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe3 =
|
| static_cast<TestRenderFrameHost*>(contents()
|
| ->GetFrameTree()
|
| @@ -2463,7 +2463,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());
|
| const GURL subframe_url("http://foo1/subframe");
|
| @@ -3917,7 +3917,7 @@ TEST_F(NavigationControllerTest, SameSubframe) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());
|
| const GURL subframe_url("http://www.google.com/#");
|
| @@ -4092,7 +4092,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| std::string(), unique_name, blink::WebSandboxFlags::None,
|
| - FrameOwnerProperties());
|
| + ParsedFeaturePolicyHeader(), FrameOwnerProperties());
|
| TestRenderFrameHost* subframe = static_cast<TestRenderFrameHost*>(
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host());
|
| const GURL url1_sub("http://foo/subframe");
|
|
|