| 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 4f38c49ac48b8eed92aea0ccdf7ad560cc8c2ae5..b05cf2bab40412fcf56afd474aa46210a4867c4e 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
|
| @@ -842,7 +842,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
|
| EXPECT_FALSE(manager->pending_frame_host());
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| // Commit to SiteInstance should be delayed until RenderFrame commit.
|
| EXPECT_TRUE(host == manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
| @@ -863,7 +863,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
|
| EXPECT_FALSE(manager->pending_frame_host());
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| EXPECT_TRUE(host == manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
| EXPECT_TRUE(host->GetSiteInstance()->HasSite());
|
| @@ -884,7 +884,7 @@ TEST_F(RenderFrameHostManagerTest, Navigate) {
|
| notifications.Reset();
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(manager->pending_frame_host(), true);
|
| + manager->DidNavigateFrame(manager->pending_frame_host(), true, false);
|
| EXPECT_TRUE(host == manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
| EXPECT_TRUE(host->GetSiteInstance()->HasSite());
|
| @@ -934,7 +934,7 @@ TEST_F(RenderFrameHostManagerTest, WebUI) {
|
| EXPECT_TRUE(manager->web_ui());
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| EXPECT_TRUE(
|
| host->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
|
| }
|
| @@ -972,7 +972,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) {
|
| host1->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
|
|
|
| // Commit and ensure we still have bindings.
|
| - manager1->DidNavigateFrame(host1, true);
|
| + manager1->DidNavigateFrame(host1, true, false);
|
| SiteInstance* webui_instance = host1->GetSiteInstance();
|
| EXPECT_EQ(host1, manager1->current_frame_host());
|
| EXPECT_TRUE(
|
| @@ -1001,7 +1001,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) {
|
| EXPECT_TRUE(
|
| host2->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
|
|
|
| - manager2->DidNavigateFrame(host2, true);
|
| + manager2->DidNavigateFrame(host2, true, false);
|
| }
|
|
|
| // Tests that we don't end up in an inconsistent state if a page does a back and
|
| @@ -1464,7 +1464,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
|
| EXPECT_EQ(manager->current_frame_host()->GetSiteInstance(), instance);
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| // Commit to SiteInstance should be delayed until RenderFrame commit.
|
| EXPECT_EQ(host, manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
| @@ -1485,7 +1485,7 @@ TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
|
| EXPECT_FALSE(manager->pending_frame_host());
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| EXPECT_EQ(host, manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
| EXPECT_EQ(host->GetSiteInstance(), instance);
|
| @@ -1525,7 +1525,7 @@ TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) {
|
| notifications.Reset();
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
|
|
| // Commit to SiteInstance should be delayed until RenderFrame commits.
|
| EXPECT_EQ(host, manager->current_frame_host());
|
| @@ -1798,7 +1798,7 @@ TEST_F(RenderFrameHostManagerTest, DetachPendingChild) {
|
| EXPECT_FALSE(manager->pending_frame_host());
|
|
|
| // Commit.
|
| - manager->DidNavigateFrame(host, true);
|
| + manager->DidNavigateFrame(host, true, false);
|
| // Commit to SiteInstance should be delayed until RenderFrame commit.
|
| EXPECT_TRUE(host == manager->current_frame_host());
|
| ASSERT_TRUE(host);
|
|
|