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

trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc

Index: trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc
===================================================================
--- trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc	(revision 284469)
+++ trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc	(working copy)
@@ -1150,16 +1150,20 @@
   content_view_core_->GetWindowAndroid()->RequestVSyncUpdate();
 }
 
-BrowserAccessibilityManager*
-    RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManager(
-        BrowserAccessibilityDelegate* delegate) {
-  base::android::ScopedJavaLocalRef<jobject> obj;
-  if (content_view_core_)
-    obj = content_view_core_->GetJavaObject();
-  return new BrowserAccessibilityManagerAndroid(
-      obj,
-      BrowserAccessibilityManagerAndroid::GetEmptyDocument(),
-      delegate);
+void RenderWidgetHostViewAndroid::CreateBrowserAccessibilityManagerIfNeeded() {
+  if (!host_ || host_->accessibility_mode() != AccessibilityModeComplete)
+    return;
+
+  if (!GetBrowserAccessibilityManager()) {
+    base::android::ScopedJavaLocalRef<jobject> obj;
+    if (content_view_core_)
+      obj = content_view_core_->GetJavaObject();
+    SetBrowserAccessibilityManager(
+        new BrowserAccessibilityManagerAndroid(
+            obj,
+            BrowserAccessibilityManagerAndroid::GetEmptyDocument(),
+            host_));
+  }
 }
 
 bool RenderWidgetHostViewAndroid::LockMouse() {
@@ -1264,14 +1268,12 @@
 
   content_view_core_ = content_view_core;
 
-  BrowserAccessibilityManager* manager = NULL;
-  if (host_)
-    manager = host_->GetRootBrowserAccessibilityManager();
-  if (manager) {
+  if (GetBrowserAccessibilityManager()) {
     base::android::ScopedJavaLocalRef<jobject> obj;
     if (content_view_core_)
       obj = content_view_core_->GetJavaObject();
-    manager->ToBrowserAccessibilityManagerAndroid()->SetContentViewCore(obj);
+    GetBrowserAccessibilityManager()->ToBrowserAccessibilityManagerAndroid()->
+        SetContentViewCore(obj);
   }
 
   AttachLayers();