Commit 546e7501 authored by Lukasz Anforowicz's avatar Lukasz Anforowicz Committed by Commit Bot

Fix test flakiness: stop using dangling pointer in comparisons

Fixed: 1133097
Change-Id: I7f3da3d24bd21797719ad7b5980d2d5d8def7511
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493661
Commit-Queue: Charlie Reis <creis@chromium.org>
Reviewed-by: default avatarCharlie Reis <creis@chromium.org>
Auto-Submit: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821085}
parent 835ca810
...@@ -7092,8 +7092,8 @@ IN_PROC_BROWSER_TEST_P(NavigationControllerBrowserTest, ...@@ -7092,8 +7092,8 @@ IN_PROC_BROWSER_TEST_P(NavigationControllerBrowserTest,
EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript)); EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
EXPECT_EQ(1U, root->child_count()); EXPECT_EQ(1U, root->child_count());
EXPECT_EQ(1U, nav_entry->root_node()->children.size()); EXPECT_EQ(1U, nav_entry->root_node()->children.size());
// |tree_node| will becoma a dangling pointer when the frame is removed below. scoped_refptr<FrameNavigationEntry> old_fne =
auto* tree_node = nav_entry->root_node()->children[0].get(); nav_entry->root_node()->children[0]->frame_entry;
EXPECT_TRUE(ExecJs(root, kRemoveFrameScript)); EXPECT_TRUE(ExecJs(root, kRemoveFrameScript));
EXPECT_EQ(0U, root->child_count()); EXPECT_EQ(0U, root->child_count());
...@@ -7106,7 +7106,10 @@ IN_PROC_BROWSER_TEST_P(NavigationControllerBrowserTest, ...@@ -7106,7 +7106,10 @@ IN_PROC_BROWSER_TEST_P(NavigationControllerBrowserTest,
EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript)); EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
EXPECT_EQ(1U, root->child_count()); EXPECT_EQ(1U, root->child_count());
EXPECT_EQ(1U, nav_entry->root_node()->children.size()); EXPECT_EQ(1U, nav_entry->root_node()->children.size());
EXPECT_NE(tree_node, nav_entry->root_node()->children[0].get()); scoped_refptr<FrameNavigationEntry> new_fne =
nav_entry->root_node()->children[0]->frame_entry;
EXPECT_TRUE(old_fne->HasOneRef()); // Only the test keeps the old FNE alive.
EXPECT_NE(old_fne.get(), new_fne.get());
EXPECT_TRUE(ExecJs(root, kRemoveFrameScript)); EXPECT_TRUE(ExecJs(root, kRemoveFrameScript));
EXPECT_EQ(0U, root->child_count()); EXPECT_EQ(0U, root->child_count());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment