Migrate accessibility from RenderView to RenderFrame.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 33a0b77f1ef29782e93782f0befff06fafed75c2..e98d886015cc3459255069a647bfc4031249b9b0 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -636,7 +636,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
     return static_cast<gfx::NativeViewAccessible>(NULL);
   HWND hwnd = host->GetAcceleratedWidget();
 
-  CreateBrowserAccessibilityManagerIfNeeded();
+  CreateBrowserAccessibilityManagerIfNeeded(NULL);
   BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
   if (manager)
     return manager->GetRoot()->ToBrowserAccessibilityWin();
@@ -1187,9 +1187,13 @@ void RenderWidgetHostViewAura::SetScrollOffsetPinning(
   // Not needed. Mac-only.
 }
 
-void RenderWidgetHostViewAura::CreateBrowserAccessibilityManagerIfNeeded() {
-  if (GetBrowserAccessibilityManager())
+void RenderWidgetHostViewAura::CreateBrowserAccessibilityManagerIfNeeded(
+    BrowserAccessibilityDelegate* delegate) {
+  if (GetBrowserAccessibilityManager()) {
+    if (delegate)
+      GetBrowserAccessibilityManager()->set_delegate(delegate);
     return;
+  }
 
   BrowserAccessibilityManager* manager = NULL;
 #if defined(OS_WIN)
@@ -1208,7 +1212,7 @@ void RenderWidgetHostViewAura::CreateBrowserAccessibilityManagerIfNeeded() {
   if (legacy_render_widget_host_HWND_) {
     manager = new BrowserAccessibilityManagerWin(
         legacy_render_widget_host_HWND_.get(), accessible_parent,
-        BrowserAccessibilityManagerWin::GetEmptyDocument(), host_);
+        BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
   }
 #else
   manager = BrowserAccessibilityManager::Create(