Revert of Bring RFH/RVH unit tests closer to reality of how RF/RV are initialized

content/test/test_web_contents.cc

Index: content/test/test_web_contents.cc
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index 2f35a8bc2fcdfca723ddc26d53f3a9128b502588..26431327a47d02fb66459afcb3bf0a7eaa0a0133 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -38,6 +38,7 @@
                                          SiteInstance* instance) {
   TestWebContents* test_web_contents = new TestWebContents(browser_context);
   test_web_contents->Init(WebContents::CreateParams(browser_context, instance));
+  test_web_contents->RenderFrameCreated(test_web_contents->GetMainFrame());
   return test_web_contents;
 }
 
@@ -105,10 +106,9 @@
   params.is_post = false;
   params.page_state = PageState::CreateFromURL(url);
 
-  TestRenderFrameHost* rfh =
-      static_cast<TestRenderFrameHost*>(render_frame_host);
-  rfh->InitializeRenderFrameIfNeeded();
-  rfh->frame_tree_node()->navigator()->DidNavigate(rfh, params);
+  RenderFrameHostImpl* rfhi =
+      static_cast<RenderFrameHostImpl*>(render_frame_host);
+  rfhi->frame_tree_node()->navigator()->DidNavigate(rfhi, params);
 }
 
 const std::string& TestWebContents::GetSaveFrameHeaders() {