Fix accessibility with out-of-process iframes.

content/browser/frame_host/render_frame_host_manager_unittest.cc

Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 4fd5b85f4da12a6a92fb86e48685cf971796ed1a..9aefca44554ac55cdba1555448d3710fa4a358ce 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -33,6 +33,7 @@
 #include "content/public/common/javascript_message_type.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "content/test/test_content_browser_client.h"
@@ -174,36 +175,6 @@ class RenderFrameHostCreatedObserver : public WebContentsObserver {
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostCreatedObserver);
 };
 
-// This observer keeps track of the last deleted RenderFrameHost to avoid
-// accessing it and causing use-after-free condition.
-class RenderFrameHostDeletedObserver : public WebContentsObserver {
- public:
-  RenderFrameHostDeletedObserver(RenderFrameHost* rfh)
-      : WebContentsObserver(WebContents::FromRenderFrameHost(rfh)),
-        process_id_(rfh->GetProcess()->GetID()),
-        routing_id_(rfh->GetRoutingID()),
-        deleted_(false) {
-  }
-
-  void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
-    if (render_frame_host->GetProcess()->GetID() == process_id_ &&
-        render_frame_host->GetRoutingID() == routing_id_) {
-      deleted_ = true;
-    }
-  }
-
-  bool deleted() {
-    return deleted_;
-  }
-
- private:
-  int process_id_;
-  int routing_id_;
-  bool deleted_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderFrameHostDeletedObserver);
-};
-
 // This WebContents observer keep track of its RVH change.
 class RenderViewHostChangedObserver : public WebContentsObserver {
  public:
@@ -321,7 +292,7 @@ class RenderFrameHostManagerTest : public RenderViewHostImplTestHarness {
 
     // Use an observer to avoid accessing a deleted renderer later on when the
     // state is being checked.
-    RenderFrameHostDeletedObserver rfh_observer(old_rfh);
+    RenderFrameDeletedObserver rfh_observer(old_rfh);
     RenderViewHostDeletedObserver rvh_observer(old_rfh->GetRenderViewHost());
     active_rfh->SendNavigate(max_page_id + 1, entry_id, true, url);
 
@@ -1382,7 +1353,7 @@ TEST_F(RenderFrameHostManagerTest, CreateSwappedOutOpenerRFHs) {
   RenderFrameHostManager* manager = contents()->GetRenderManagerForTesting();
   TestRenderFrameHost* rfh1 = main_test_rfh();
   scoped_refptr<SiteInstanceImpl> site_instance1 = rfh1->GetSiteInstance();
-  RenderFrameHostDeletedObserver rfh1_deleted_observer(rfh1);
+  RenderFrameDeletedObserver rfh1_deleted_observer(rfh1);
   TestRenderViewHost* rvh1 = test_rvh();
 
   // Create 2 new tabs and simulate them being the opener chain for the main
@@ -1857,7 +1828,7 @@ TEST_F(RenderFrameHostManagerTest, DeleteFrameAfterSwapOutACK) {
   // Navigate to the first page.
   contents()->NavigateAndCommit(kUrl1);
   TestRenderFrameHost* rfh1 = contents()->GetMainFrame();
-  RenderFrameHostDeletedObserver rfh_deleted_observer(rfh1);
+  RenderFrameDeletedObserver rfh_deleted_observer(rfh1);
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state());
 
   // Navigate to new site, simulating onbeforeunload approval.
@@ -1903,7 +1874,7 @@ TEST_F(RenderFrameHostManagerTest, SwapOutFrameAfterSwapOutACK) {
   // Navigate to the first page.
   contents()->NavigateAndCommit(kUrl1);
   TestRenderFrameHost* rfh1 = contents()->GetMainFrame();
-  RenderFrameHostDeletedObserver rfh_deleted_observer(rfh1);
+  RenderFrameDeletedObserver rfh_deleted_observer(rfh1);
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state());
 
   // Increment the number of active frames in SiteInstanceImpl so that rfh1 is
@@ -1952,7 +1923,7 @@ TEST_F(RenderFrameHostManagerTest,
   // Navigate to the first page.
   contents()->NavigateAndCommit(kUrl1);
   TestRenderFrameHost* rfh1 = contents()->GetMainFrame();
-  RenderFrameHostDeletedObserver rfh_deleted_observer(rfh1);
+  RenderFrameDeletedObserver rfh_deleted_observer(rfh1);
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state());
 
   // Increment the number of active frames in SiteInstanceImpl so that rfh1 is
@@ -2011,7 +1982,7 @@ TEST_F(RenderFrameHostManagerTest,
   {
     pending_rfh = contents()->GetFrameTree()->root()->render_manager()
         ->pending_frame_host();
-    RenderFrameHostDeletedObserver rfh_deleted_observer(pending_rfh);
+    RenderFrameDeletedObserver rfh_deleted_observer(pending_rfh);
 
     // Cancel the navigation by simulating a declined beforeunload dialog.
     contents()->GetMainFrame()->OnMessageReceived(
@@ -2029,7 +2000,7 @@ TEST_F(RenderFrameHostManagerTest,
   {
     pending_rfh = contents()->GetFrameTree()->root()->render_manager()
         ->pending_frame_host();
-    RenderFrameHostDeletedObserver rfh_deleted_observer(pending_rfh);
+    RenderFrameDeletedObserver rfh_deleted_observer(pending_rfh);
 
     // Increment the number of active frames in the new SiteInstance, which will
     // cause the pending RFH to be deleted and a RenderFrameProxyHost to be
@@ -2123,8 +2094,8 @@ TEST_F(RenderFrameHostManagerTest, DetachPendingChild) {
   EXPECT_FALSE(contents()->CrossProcessNavigationPending())
     << "There should be no top-level pending navigation.";
 
-  RenderFrameHostDeletedObserver delete_watcher1(GetPendingFrameHost(iframe1));
-  RenderFrameHostDeletedObserver delete_watcher2(GetPendingFrameHost(iframe2));
+  RenderFrameDeletedObserver delete_watcher1(GetPendingFrameHost(iframe1));
+  RenderFrameDeletedObserver delete_watcher2(GetPendingFrameHost(iframe2));
   EXPECT_FALSE(delete_watcher1.deleted());
   EXPECT_FALSE(delete_watcher2.deleted());