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

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: Add workaround to <webview> bug (492830) 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 e22ca30f9b015a2e6bdde7d0ac88fe0702b2bae6..5a60ec8540c05ac0ac392e9a81722fdc4b472092 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -309,7 +309,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();
@@ -340,7 +340,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(),
@@ -362,7 +362,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"
"RenderProcessGone -> 1*: []",
activity.GetLog());
}

Powered by Google App Engine
This is Rietveld 408576698