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

content/browser/web_contents/web_contents_impl_unittest.cc

Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 6a3f6e0174b949bada94f2ccaa9143302a8d9fa3..3dd0a006df769d86745b80e6733c8b96fc4663e1 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -1894,9 +1894,6 @@ TEST_F(WebContentsImplTest, ShowInterstitialCrashRendererThenGoBack) {
 
   // While the interstitial is showing, go back.
   controller().GoBack();
-  main_test_rfh()->PrepareForCommit();
-  contents()->GetMainFrame()->SendNavigate(1, entry->GetUniqueID(), false,
-                                           url1);
 

[ncarter (slow), 2015/05/26 21:44:14]

What's the story with the lines that were removed here? Were they there as a
hack?

[nasko, 2015/05/26 22:25:49]

This might belong to a separate CL. It is incorrect assumption on the part of
the unit test. When we do a GoBack() while an interstitial page is showing, we
dismiss the interstitial, but we drop the navigation. Therefore the
PrepareForCommit and SendNavigate are not needed and test the wrong thing. Now
that I've modified the unit tests to be closer to reality, I've found this as a
failure and after chatting with Charlie, this is the right fix for it.

   // Make sure we are back to the original page and that the interstitial is
   // gone.
@@ -3016,6 +3013,9 @@ TEST_F(WebContentsImplTest, MediaPowerSaveBlocking) {
   TestRenderFrameHost* rfh = contents()->GetMainFrame();
   AudioStateProvider* audio_state = contents()->audio_state_provider();
 
+  // Ensure RenderFrame is initialized before simulating events coming from it.
+  main_test_rfh()->InitializeRenderFrameIfNeeded();
+
   // The audio power save blocker should not be based on having a media player
   // when audio stream monitoring is available.
   if (audio_state->IsAudioStateAvailable()) {