Revert of Fix flaky OOPIF tests by waiting for the old RenderFrame to be deleted.

content/browser/top_document_isolation_browsertest.cc

Index: content/browser/top_document_isolation_browsertest.cc
diff --git a/content/browser/top_document_isolation_browsertest.cc b/content/browser/top_document_isolation_browsertest.cc
index 9063208eee16578118c13e524aa0ed4629333cbd..b0409db840625a8689289aec953c485ae552759d 100644
--- a/content/browser/top_document_isolation_browsertest.cc
+++ b/content/browser/top_document_isolation_browsertest.cc
@@ -278,8 +278,9 @@
       DepictFrameTree(root()));
 }
 
+// Flaky. See http://crbug.com/611300.
 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
-                       NavigateToSubframeSiteWithPopup2) {
+                       DISABLED_NavigateToSubframeSiteWithPopup2) {
   if (content::AreAllSitesIsolatedForTesting())
     return;  // Top Document Isolation is disabled in this mode.
 
@@ -364,9 +365,7 @@
   // If we navigate the popup to a new site, it ought to transfer processes.
   GURL d_url(embedded_test_server()->GetURL(
       "d.com", "/cross_site_iframe_factory.html?d"));
-  RenderFrameDeletedObserver deleted_observer(popup_root->current_frame_host());
   NavigateToURL(popup, d_url);
-  deleted_observer.WaitUntilDeleted();
   EXPECT_EQ(
       " Site D ------------ proxies for B\n"
       "Where B = default subframe process\n"
@@ -383,7 +382,15 @@
       DepictFrameTree(root()));
 }
 
-IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, FramesForSitesInHistory) {
+// Flaky on Mac. See https://crbug.com/611344.
+#if defined(OS_MACOSX)
+#define MAYBE_FramesForSitesInHistory DISABLED_FramesForSitesInHistory
+#else
+#define MAYBE_FramesForSitesInHistory FramesForSitesInHistory
+#endif
+
+IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
+                       MAYBE_FramesForSitesInHistory) {
   if (content::AreAllSitesIsolatedForTesting())
     return;  // Top Document Isolation is disabled in this mode.
 
@@ -403,14 +410,7 @@
       DepictFrameTree(root()));
 
   // Browser-initiated navigation to b.com.
-  {
-    // For any cross-process navigations, we must wait for the old RenderFrame
-    // to be deleted before calling DepictFrameTree, or else there's a chance
-    // the old SiteInstance could be listed while pending deletion.
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    NavigateToURL(shell(), b_url);
-    deleted_observer.WaitUntilDeleted();
-  }
+  NavigateToURL(shell(), b_url);
   EXPECT_EQ(
       " Site B\n"
       "Where B = http://b.com/",
@@ -424,24 +424,16 @@
       DepictFrameTree(root()));
 
   // Browser-initiated navigation to c.com.
-  {
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    NavigateToURL(shell(), c_url);
-    deleted_observer.WaitUntilDeleted();
-  }
+  NavigateToURL(shell(), c_url);
   EXPECT_EQ(
       " Site C\n"
       "Where C = http://c.com/",
       DepictFrameTree(root()));
 
   // Now, navigate to a fourth site with iframes to the sites in the history.
-  {
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    NavigateToURL(shell(),
-                  embedded_test_server()->GetURL(
-                      "d.com", "/cross_site_iframe_factory.html?d(a,b,c)"));
-    deleted_observer.WaitUntilDeleted();
-  }
+  NavigateToURL(shell(),
+                embedded_test_server()->GetURL(
+                    "d.com", "/cross_site_iframe_factory.html?d(a,b,c)"));
 
   EXPECT_EQ(
       " Site D ------------ proxies for E\n"
@@ -453,20 +445,12 @@
       DepictFrameTree(root()));
 
   // Now try going back.
-  {
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    GoBack();
-    deleted_observer.WaitUntilDeleted();
-  }
+  GoBack();
   EXPECT_EQ(
       " Site C\n"
       "Where C = http://c.com/",
       DepictFrameTree(root()));
-  {
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    GoBack();
-    deleted_observer.WaitUntilDeleted();
-  }
+  GoBack();
   EXPECT_EQ(
       " Site B\n"
       "Where B = http://b.com/",
@@ -476,11 +460,7 @@
       " Site B\n"
       "Where B = http://b.com/",
       DepictFrameTree(root()));
-  {
-    RenderFrameDeletedObserver deleted_observer(root()->current_frame_host());
-    GoBack();
-    deleted_observer.WaitUntilDeleted();
-  }
+  GoBack();
   EXPECT_EQ(
       " Site A\n"
       "Where A = http://a.com/",