| 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 775feb3debf69d04b8a1b09e76f1337665ef18f5..af2481c2058cee14f434c00a1324f06498966fec 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -2051,7 +2051,7 @@ TEST_F(NavigationControllerTest, NewSubframe) {
|
| // Prereq: add a subframe with an initial auto-subframe navigation.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName0", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| @@ -2132,7 +2132,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| // Add a subframe and navigate it.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName0", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| @@ -2178,7 +2178,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| // Add a second subframe and navigate.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName1", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe2 =
|
| contents()->GetFrameTree()->root()->child_at(1)->current_frame_host();
|
| @@ -2224,7 +2224,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| // Add a nested subframe and navigate.
|
| subframe->OnCreateChildFrame(process()->GetNextRoutingID(),
|
| blink::WebTreeScopeType::Document, std::string(),
|
| - blink::WebSandboxFlags::None,
|
| + "uniqueName2", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe3 = contents()
|
| ->GetFrameTree()
|
| @@ -2289,7 +2289,7 @@ TEST_F(NavigationControllerTest, BackSubframe) {
|
| // Prereq: add a subframe with an initial auto-subframe navigation.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName0", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| @@ -3723,7 +3723,7 @@ TEST_F(NavigationControllerTest, SameSubframe) {
|
| // Add and navigate a subframe that would normally count as in-page.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName0", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| @@ -3890,7 +3890,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
|
| // automatically loaded. Auto subframes don't increment the page ID.
|
| main_test_rfh()->OnCreateChildFrame(
|
| process()->GetNextRoutingID(), blink::WebTreeScopeType::Document,
|
| - std::string(), blink::WebSandboxFlags::None,
|
| + std::string(), "uniqueName0", blink::WebSandboxFlags::None,
|
| blink::WebFrameOwnerProperties());
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
|
|