Scope and clean up uses of AccessibilityMode.

content/renderer/accessibility/render_accessibility_impl.cc

Index: content/renderer/accessibility/render_accessibility_impl.cc
diff --git a/content/renderer/accessibility/render_accessibility_impl.cc b/content/renderer/accessibility/render_accessibility_impl.cc
index c4c2723fd1815f7e9808f22a28d8d554699245e6..e6567ee5f6ae246ab63258df25cee8906d19c823 100644
--- a/content/renderer/accessibility/render_accessibility_impl.cc
+++ b/content/renderer/accessibility/render_accessibility_impl.cc
@@ -69,7 +69,11 @@ void RenderAccessibilityImpl::SnapshotAccessibilityTree(
   WebAXObject root = context.root();
   if (!root.updateLayoutAndCheckValidity())
     return;
-  BlinkAXTreeSource tree_source(render_frame, ACCESSIBILITY_MODE_COMPLETE);
+  BlinkAXTreeSource tree_source(
+      render_frame,
+      AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents |
+          AccessibilityMode::kInlineTextBoxes |
+          AccessibilityMode::kScreenReader | AccessibilityMode::kHTML);
   tree_source.SetRoot(root);
   ScopedFreezeBlinkAXTreeSource freeze(&tree_source);
   BlinkAXTreeSerializer serializer(&tree_source);
@@ -102,7 +106,7 @@ RenderAccessibilityImpl::RenderAccessibilityImpl(RenderFrameImpl* render_frame,
 #if !defined(OS_ANDROID)
   // Inline text boxes can be enabled globally on all except Android.
   // On Android they can be requested for just a specific node.
-  if (mode & ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES)
+  if (mode.has_mode(AccessibilityMode::kInlineTextBoxes))
     settings->setInlineTextBoxAccessibilityEnabled(true);
 #endif