Fix flakiness when disabling swap out timer in tests.

content/browser/frame_host/render_frame_host_manager_browsertest.cc

Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index 8708039c66173d259597ecebd3aeac9c04451863..9f6cf414bc10cd9b4c85a02ce04c818d8b2c78c1 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -2360,17 +2360,8 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
 
 // Ensure that we don't crash the renderer in CreateRenderView if a proxy goes
 // away between swapout and the next navigation.  See https://crbug.com/581912.
-// Dr.Memory reports a use-after-free in this test, thus it may be flaky on
-// Windows. See https://crbug.com/600957.
-#if defined(OS_WIN)
-#define MAYBE_CreateRenderViewAfterProcessKillAndClosedProxy \
-    DISABLED_CreateRenderViewAfterProcessKillAndClosedProxy
-#else
-#define MAYBE_CreateRenderViewAfterProcessKillAndClosedProxy \
-    CreateRenderViewAfterProcessKillAndClosedProxy
-#endif
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
-                       MAYBE_CreateRenderViewAfterProcessKillAndClosedProxy) {
+                       CreateRenderViewAfterProcessKillAndClosedProxy) {
   StartEmbeddedServer();
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
@@ -2395,11 +2386,11 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
   // Navigate the first tab to a different site, and only wait for commit, not
   // load stop.
   RenderFrameHostImpl* rfh_a = root->current_frame_host();
+  rfh_a->DisableSwapOutTimerForTesting();
   SiteInstanceImpl* site_instance_a = rfh_a->GetSiteInstance();
   TestFrameNavigationObserver commit_observer(root);
   shell()->LoadURL(embedded_test_server()->GetURL("b.com", "/title2.html"));
   commit_observer.WaitForCommit();
-  rfh_a->ResetSwapOutTimerForTesting();
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
             new_shell->web_contents()->GetSiteInstance());
   EXPECT_TRUE(root->render_manager()->GetRenderFrameProxyHost(site_instance_a));
@@ -2455,11 +2446,11 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
   // Navigate the tab to a different site, and only wait for commit, not load
   // stop.
   RenderFrameHostImpl* rfh_a = root->current_frame_host();
+  rfh_a->DisableSwapOutTimerForTesting();
   SiteInstanceImpl* site_instance_a = rfh_a->GetSiteInstance();
   TestFrameNavigationObserver commit_observer(root);
   shell()->LoadURL(embedded_test_server()->GetURL("b.com", "/title2.html"));
   commit_observer.WaitForCommit();
-  rfh_a->ResetSwapOutTimerForTesting();
   EXPECT_NE(site_instance_a, shell()->web_contents()->GetSiteInstance());
 
   // The previous RFH and RVH should still be pending deletion, as we wait for