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

content/browser/web_contents/web_contents_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
@@ skipping 1876 matching lines @@
   interstitial->Show();
   int interstitial_entry_id = controller().GetTransientEntry()->GetUniqueID();
   interstitial->TestDidNavigate(2, interstitial_entry_id, true,
                                 interstitial_url);
 
   // Crash the renderer
   contents()->GetMainFrame()->GetProcess()->SimulateCrash();
 
   // 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.
   EXPECT_EQ(TestInterstitialPage::CANCELED, state);
   entry = controller().GetVisibleEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(url1.spec(), entry->GetURL().spec());
 
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(deleted);
 }
@@ skipping 1098 matching lines @@
   const int kPlayerAudioOnlyId = -15;
   const int kPlayerVideoOnlyId = 30;
   const int kPlayerRemoteId = -30;
 
   EXPECT_FALSE(contents()->has_audio_power_save_blocker_for_testing());
   EXPECT_FALSE(contents()->has_video_power_save_blocker_for_testing());
 
   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()) {
     // Send a fake audio stream monitor notification.  The audio power save
     // blocker should be created.
     audio_state->set_was_recently_audible_for_testing(true);
     contents()->NotifyNavigationStateChanged(INVALIDATE_TYPE_TAB);
     EXPECT_TRUE(contents()->has_audio_power_save_blocker_for_testing());
 
     // Send another fake notification, this time when WasRecentlyAudible() will
@@ skipping 82 matching lines @@
 
   // Crash the renderer.
   contents()->GetMainFrame()->GetProcess()->SimulateCrash();
 
   // Verify that all the power save blockers have been released.
   EXPECT_FALSE(contents()->has_video_power_save_blocker_for_testing());
   EXPECT_FALSE(contents()->has_audio_power_save_blocker_for_testing());
 }
 
 }  // namespace content