Scope and clean up uses of AccessibilityMode.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index e036fb8b1664ecae254d67f2594a5dc420a12fc7..205295979116cee41e8d988921a2532449999bd9 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1361,8 +1361,13 @@ void ContentViewCoreImpl::SetAccessibilityEnabledInternal(bool enabled) {
     // 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_) {