Fix flakiness when disabling swap out timer in tests.

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 2342 matching lines @@
 
   // Navigate the main tab to the site of the popup. This will cause the
   // RenderView for b.com in the main tab to be recreated. If the issue
   // is not fixed, this will result in process crash and failing test.
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL("b.com", "/title3.html")));
 }
 
 // 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()
                             ->root();
 
   // Give an initial page an unload handler that never completes.
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL("a.com", "/title1.html")));
   EXPECT_TRUE(ExecuteScript(root->current_frame_host(),
                             "window.onunload=function(e){ while(1); };\n"));
 
   // Open a popup in the same process.
   Shell* new_shell =
       OpenPopup(shell()->web_contents(), GURL(url::kAboutBlankURL), "foo");
   FrameTreeNode* popup_root =
       static_cast<WebContentsImpl*>(new_shell->web_contents())
           ->GetFrameTree()
           ->root();
   EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
             new_shell->web_contents()->GetSiteInstance());
 
   // 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));
 
   // The previous RFH should still be pending deletion, as we wait for either
   // the SwapOut ACK or a timeout.
   ASSERT_TRUE(rfh_a->IsRenderFrameLive());
   ASSERT_FALSE(rfh_a->is_active());
 
   // The corresponding RVH should not be pending deletion due to the proxy.
@@ skipping 35 matching lines @@
 
   // Give an initial page an unload handler that never completes.
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL("a.com", "/title1.html")));
   EXPECT_TRUE(ExecuteScript(root->current_frame_host(),
                             "window.onunload=function(e){ while(1); };\n"));
 
   // 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
   // either the SwapOut ACK or a timeout.
   ASSERT_TRUE(rfh_a->IsRenderFrameLive());
   ASSERT_FALSE(rfh_a->is_active());
   EXPECT_TRUE(root->render_manager()->IsViewPendingDeletion(
                   rfh_a->render_view_host()));
 
   // Open a popup in the new B process.
@@ skipping 80 matching lines @@
         web_contents->GetRenderManagerForTesting()->speculative_frame_host());
   } else {
     EXPECT_FALSE(
         web_contents->GetRenderManagerForTesting()->pending_frame_host());
   }
 
   ResourceDispatcherHost::Get()->SetDelegate(nullptr);
 }
 
 }  // namespace content