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, 3 insertions, 3 deletions

diff --git a/content/test/accessibility_browser_test_utils.h b/content/test/accessibility_browser_test_utils.h
index 2e22b6f..5111e3c 100644
--- a/content/test/accessibility_browser_test_utils.h
+++ b/content/test/accessibility_browser_test_utils.h
@@ -6,14 +6,14 @@
 #define CONTENT_TEST_ACCESSIBILITY_BROWSER_TEST_UTILS_H_
 
 #include "base/memory/weak_ptr.h"
-#include "content/common/accessibility_mode_enums.h"
+#include "content/common/view_message_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_tree.h"
 
 namespace content {
 
 class MessageLoopRunner;
-class RenderFrameHostImpl;
+class RenderViewHostImpl;
 class Shell;
 
 // Create an instance of this class *before* doing any operation that
@@ -53,7 +53,7 @@ class AccessibilityNotificationWaiter {
   bool IsAboutBlank();
 
   Shell* shell_;
-  RenderFrameHostImpl* frame_host_;
+  RenderViewHostImpl* view_host_;
   ui::AXEvent event_to_wait_for_;
   scoped_refptr<MessageLoopRunner> loop_runner_;
   base::WeakPtrFactory<AccessibilityNotificationWaiter> weak_factory_;