| 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 15e51197fced6ef35c6ecdb758254db17211b76e..a1ee050eb9dc4700a654341c0a54499ed850caad 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
|
| @@ -2116,8 +2116,9 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| navigation_entry_committed_counter_ = 0;
|
|
|
| // Add a subframe and navigate it.
|
| - main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE, std::string(),
|
| - SandboxFlags::NONE);
|
| + main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE,
|
| + blink::WebTreeScopeType::Document,
|
| + std::string(), SandboxFlags::NONE);
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| const GURL url2("http://foo/2");
|
| @@ -2161,8 +2162,9 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| }
|
|
|
| // Add a second subframe and navigate.
|
| - main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE, std::string(),
|
| - SandboxFlags::NONE);
|
| + main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE,
|
| + blink::WebTreeScopeType::Document,
|
| + std::string(), SandboxFlags::NONE);
|
| RenderFrameHostImpl* subframe2 =
|
| contents()->GetFrameTree()->root()->child_at(1)->current_frame_host();
|
| const GURL url3("http://foo/3");
|
| @@ -2206,7 +2208,8 @@ TEST_F(NavigationControllerTest, AutoSubframe) {
|
| }
|
|
|
| // Add a nested subframe and navigate.
|
| - subframe->OnCreateChildFrame(MSG_ROUTING_NONE, std::string(),
|
| + subframe->OnCreateChildFrame(MSG_ROUTING_NONE,
|
| + blink::WebTreeScopeType::Document, std::string(),
|
| SandboxFlags::NONE);
|
| RenderFrameHostImpl* subframe3 = contents()
|
| ->GetFrameTree()
|
| @@ -3616,8 +3619,9 @@ TEST_F(NavigationControllerTest, SameSubframe) {
|
| EXPECT_EQ(controller.GetLastCommittedEntryIndex(), 0);
|
|
|
| // Add and navigate a subframe that would normally count as in-page.
|
| - main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE, std::string(),
|
| - SandboxFlags::NONE);
|
| + main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE,
|
| + blink::WebTreeScopeType::Document,
|
| + std::string(), SandboxFlags::NONE);
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| const GURL subframe_url("http://www.google.com/#");
|
| @@ -3766,8 +3770,9 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) {
|
|
|
| // Send a subframe update from the first page, as if one had just
|
| // automatically loaded. Auto subframes don't increment the page ID.
|
| - main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE, std::string(),
|
| - SandboxFlags::NONE);
|
| + main_test_rfh()->OnCreateChildFrame(MSG_ROUTING_NONE,
|
| + blink::WebTreeScopeType::Document,
|
| + std::string(), SandboxFlags::NONE);
|
| RenderFrameHostImpl* subframe =
|
| contents()->GetFrameTree()->root()->child_at(0)->current_frame_host();
|
| const GURL url1_sub("http://foo/subframe");
|
|
|