Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: content/browser/frame_host/frame_tree_unittest.cc

Issue 1151973005: Bring RFH/RVH unit tests closer to reality of how RF/RV are initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix IsRenderFrameLive to be independent of RenderViewHost. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/frame_tree_unittest.cc
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index cf633e60307c44b36bbac11926834545025a320b..f906a4dcc10725f0abf8a907f4d566d32734241b 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -305,7 +305,7 @@ TEST_F(FrameTreeTest, PreviousSibling) {
TEST_F(FrameTreeTest, ObserverWalksTreeDuringFrameCreation) {
TreeWalkingWebContentsLogger activity(contents());
contents()->NavigateAndCommit(GURL("http://www.google.com"));
- EXPECT_EQ("", activity.GetLog());
+ EXPECT_EQ("RenderFrameCreated(1) -> 1: []", activity.GetLog());
FrameTree* frame_tree = contents()->GetFrameTree();
FrameTreeNode* root = frame_tree->root();
@@ -334,7 +334,7 @@ TEST_F(FrameTreeTest, ObserverWalksTreeDuringFrameCreation) {
TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
TreeWalkingWebContentsLogger activity(contents());
contents()->NavigateAndCommit(GURL("http://www.google.com"));
- EXPECT_EQ("", activity.GetLog());
+ EXPECT_EQ("RenderFrameCreated(1) -> 1: []", activity.GetLog());
main_test_rfh()->OnCreateChildFrame(22, blink::WebTreeScopeType::Document,
std::string(), SandboxFlags::NONE);
@@ -354,7 +354,7 @@ TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
EXPECT_EQ(
"RenderFrameDeleted(23) -> 1: [22: [], 23*: []]\n"
"RenderFrameDeleted(22) -> 1: [22*: [], 23*: []]\n"
- "RenderFrameDeleted(1) -> 1: []\n" // TODO(nick): Should be "1*:"
+ "RenderFrameDeleted(1) -> 1*: []\n"
ncarter (slow) 2015/05/26 21:44:14 Hooray!
nasko 2015/05/26 22:25:48 Yay!
"RenderProcessGone -> 1*: []",
activity.GetLog());
}

Powered by Google App Engine
This is Rietveld 408576698