Revert 284065 "Revert of Revert of Migrate accessibility from Re..."

Reason for revert:
Use-after-free raised on MFYI waterfall.
BUG=395670

> Revert of Revert of Migrate accessibility from RenderView to RenderFrame. (https://codereview.chromium.org/407493002/)
> 
> Reason for revert:
> Reverting the revert. This didn't break the tree; it's still broken without the patch. :(
> 
> Sorry for the noise!
> 
> Original issue's description:
> > Revert of Migrate accessibility from RenderView to RenderFrame. (https://codereview.chromium.org/273423004/)
> > 
> > Reason for revert:
> > Speculative revert to fix XP bots.
> > 
> > XP bots started crashing http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/32011 and http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%282%29/builds/34677
> > 
> > This CL is the most suspicious in the range. If it doesn't fix the bots, I'll unrevert it.
> > 
> > Original issue's description:
> > > Migrate accessibility from RenderView to RenderFrame and RVH to RFH.
> > > 
> > > In preparation for out-of-process iframes, move almost all accessibility
> > > functionality from RenderView to RenderFrame, and from RVHI and RWHI
> > > to RFHI.
> > > 
> > > In addition, the accessibility mode is moved to WebContents, and changing
> > > the mode triggers changing it on all frames.
> > > 
> > > BUG=368298
> > > R=jam@chromium.org, kenrb@chromium.org, nick@chromium.org
> > > 
> > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283994
> > 
> > TBR=dmazzoni@chromium.org
> > NOTRY=true
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284032
> 
> TBR=creis@chromium.org,nick@chromium.org,nasko@chromium.org,jam@chromium.org,dtseng@chromium.org,jschuh@chromium.org,tsepez@chromium.org,kenrb@chromium.org,dmazzoni@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/407493004

TBR=mkwst@chromium.org

Review URL: https://codereview.chromium.org/408663006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284470 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 12 deletions

diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc
index e91b2cf..ba0331c 100644
--- a/content/test/accessibility_browser_test_utils.cc
+++ b/content/test/accessibility_browser_test_utils.cc
@@ -8,9 +8,8 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_message_enums.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
@@ -27,9 +26,9 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(Shell* shell)
       weak_factory_(this),
       event_target_id_(0) {
   WebContents* web_contents = shell_->web_contents();
-  frame_host_ = static_cast<RenderFrameHostImpl*>(
-      web_contents->GetMainFrame());
-  frame_host_->SetAccessibilityCallbackForTesting(
+  view_host_ = static_cast<RenderViewHostImpl*>(
+      web_contents->GetRenderViewHost());
+  view_host_->SetAccessibilityCallbackForTesting(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));
 }
@@ -43,14 +42,13 @@ AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
       loop_runner_(new MessageLoopRunner()),
       weak_factory_(this),
       event_target_id_(0) {
-  WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
-      shell_->web_contents());
-  frame_host_ = static_cast<RenderFrameHostImpl*>(
-      web_contents->GetMainFrame());
-  frame_host_->SetAccessibilityCallbackForTesting(
+  WebContents* web_contents = shell_->web_contents();
+  view_host_ = static_cast<RenderViewHostImpl*>(
+      web_contents->GetRenderViewHost());
+  view_host_->SetAccessibilityCallbackForTesting(
       base::Bind(&AccessibilityNotificationWaiter::OnAccessibilityEvent,
                  weak_factory_.GetWeakPtr()));
-  web_contents->AddAccessibilityMode(accessibility_mode);
+  view_host_->AddAccessibilityMode(accessibility_mode);
 }
 
 AccessibilityNotificationWaiter::~AccessibilityNotificationWaiter() {
@@ -61,7 +59,7 @@ void AccessibilityNotificationWaiter::WaitForNotification() {
 }
 
 const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {
-  return *frame_host_->GetAXTreeForTesting();
+  return view_host_->ax_tree_for_testing();
 }
 
 void AccessibilityNotificationWaiter::OnAccessibilityEvent(