Fix accessibility with out-of-process iframes.

content/browser/frame_host/render_frame_host_manager_unittest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_switches.h"
 #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"
 #include "content/test/test_content_client.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "net/base/load_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
@@ skipping 68 matching lines @@
   }
 
   bool is_closed() { return close_called_; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CloseWebContentsDelegate);
 
   bool close_called_;
 };
 
-// This observer keeps track of the last deleted RenderViewHost to avoid
-// accessing it and causing use-after-free condition.
-class RenderViewHostDeletedObserver : public WebContentsObserver {
- public:
-  RenderViewHostDeletedObserver(RenderViewHost* rvh)
-      : WebContentsObserver(WebContents::FromRenderViewHost(rvh)),
-        process_id_(rvh->GetProcess()->GetID()),
-        routing_id_(rvh->GetRoutingID()),
-        deleted_(false) {
-  }
-
-  void RenderViewDeleted(RenderViewHost* render_view_host) override {
-    if (render_view_host->GetProcess()->GetID() == process_id_ &&
-        render_view_host->GetRoutingID() == routing_id_) {
-      deleted_ = true;
-    }
-  }
-
-  bool deleted() {
-    return deleted_;
-  }
-
- private:
-  int process_id_;
-  int routing_id_;
-  bool deleted_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderViewHostDeletedObserver);
-};
-
 // This observer keeps track of the last created RenderFrameHost to allow tests
 // to ensure that no RenderFrameHost objects are created when not expected.
 class RenderFrameHostCreatedObserver : public WebContentsObserver {
  public:
   RenderFrameHostCreatedObserver(WebContents* web_contents)
       : WebContentsObserver(web_contents),
         created_(false) {
   }
 
   void RenderFrameCreated(RenderFrameHost* render_frame_host) override {
     created_ = true;
   }
 
   bool created() {
     return created_;
   }
 
  private:
   bool created_;
 
   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:
   RenderViewHostChangedObserver(WebContents* web_contents)
       : WebContentsObserver(web_contents), host_changed_(false) {}
 
   // WebContentsObserver.
   void RenderViewHostChanged(RenderViewHost* old_host,
                              RenderViewHost* new_host) override {
     host_changed_ = true;
@@ skipping 1932 matching lines @@
   EXPECT_FALSE(contents2->GetMainFrame()->IsRenderFrameLive());
   contents2->NavigateAndCommit(kUrl3);
   EXPECT_TRUE(contents2->GetMainFrame()->IsRenderFrameLive());
   EXPECT_NE(nullptr,
             iframe->GetRenderFrameProxyHost(contents1->GetSiteInstance()));
   EXPECT_EQ(nullptr,
             iframe->GetRenderFrameProxyHost(contents2->GetSiteInstance()));
 }
 
 }  // namespace content