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()); |
} |