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

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

Issue 921443003: Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete pending callbacks in ManifestManagerHost destructor. Created 5 years, 10 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 8fdcf71e3fc9dcfade31a24deca0ffe5cf78a03a..ad4fd7567fbec6dcab38dbb2c7f30607ebf26ce5 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -69,9 +69,13 @@ class TreeWalkingWebContentsLogger : public WebContentsObserver {
void RenderFrameHostChanged(RenderFrameHost* old_host,
RenderFrameHost* new_host) override {
+ // TODO(nasko): Re-enable this logging once RenderFrameHostChanged observer
+ // methods are fixed. See https://crbug.com/450799.
+ /*
if (old_host)
LogWhatHappened("RenderFrameChanged(old)", old_host);
LogWhatHappened("RenderFrameChanged(new)", new_host);
+ */
}
void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
@@ -229,11 +233,13 @@ TEST_F(FrameTreeTest, ObserverWalksTreeAfterCrash) {
EXPECT_EQ("RenderFrameCreated(23) -> 1: [22: [], 23: []]", activity.GetLog());
// Crash the renderer
- main_rfh()->OnMessageReceived(FrameHostMsg_RenderProcessGone(
- 0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1));
+ main_test_rfh()->OnMessageReceived(FrameHostMsg_RenderProcessGone(
+ main_test_rfh()->GetRoutingID(), base::TERMINATION_STATUS_PROCESS_CRASHED,
+ -1));
EXPECT_EQ(
"RenderFrameDeleted(22) -> 1: []\n"
"RenderFrameDeleted(23) -> 1: []\n"
+ "RenderFrameDeleted(1) -> 1: []\n"
"RenderProcessGone -> 1: []",
activity.GetLog());
}

Powered by Google App Engine
This is Rietveld 408576698