Fix flakiness when disabling swap out timer in tests.

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 8e5046c893be33cc63e90a4ee5164bb8bbe817ec..3292e3a950ea823af14a04e756e1f9ae0ceea565 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -751,7 +751,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
 
   // Allows tests to disable the swapout event timer to simulate bugs that
   // happen before it fires (to avoid flakiness).
-  void ResetSwapOutTimerForTesting();
+  void DisableSwapOutTimerForTesting();
 
   // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
   // refcount that calls Shutdown when it reaches zero.  This allows each
@@ -884,7 +884,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
 
   // Used to swap out or shut down this RFH when the unload event is taking too
   // long to execute, depending on the number of active frames in the
-  // SiteInstance.
+  // SiteInstance.  May be null in tests.
   std::unique_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
 
   std::unique_ptr<ServiceRegistryImpl> service_registry_;