Scope and clean up uses of AccessibilityMode.

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 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 "content/browser/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 1343 matching lines @@
       if (manager) {
         manager->SetContentViewCore(GetJavaObject());
         return;
       }
     }
 
     // Otherwise, enable accessibility globally unless it was
     // explicitly disallowed by a command-line flag, then enable it for
     // this WebContents if that succeeded.
     accessibility_state->OnScreenReaderDetected();
-    if (accessibility_state->IsAccessibleBrowser() && web_contents_)
-      web_contents_->AddAccessibilityMode(ACCESSIBILITY_MODE_COMPLETE);
+    if (accessibility_state->IsAccessibleBrowser() && web_contents_) {
+      AccessibilityMode complete_mode(
+          AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents |
+          AccessibilityMode::kInlineTextBoxes |
+          AccessibilityMode::kScreenReader | AccessibilityMode::kHTML);
+      web_contents_->AddAccessibilityMode(complete_mode);
+    }
   } else {
     accessibility_state->ResetAccessibilityMode();
     if (web_contents_) {
       web_contents_->SetAccessibilityMode(
           accessibility_state->accessibility_mode());
     }
   }
 }
 
 void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
@@ skipping 155 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content