Scope and clean up uses of AccessibilityMode.

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 90e361c9267369721ebe677d5976c1e389f999ee..e654ec7430e05500fafcf4cb9bdf8297455062a1 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -23,6 +23,7 @@
 #include "cc/trees/layer_tree_host.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/service_worker/service_worker_network_provider.h"
+#include "content/common/accessibility_mode.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/frame_messages.h"
 #include "content/common/frame_owner_properties.h"
@@ -1973,20 +1974,26 @@ TEST_F(RenderViewImplTest, ServiceWorkerNetworkProviderSetup) {
 }
 
 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
-  ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
+  ASSERT_TRUE(frame()->accessibility_mode().is_mode_off());
   ASSERT_FALSE(frame()->render_accessibility());
 
-  frame()->SetAccessibilityMode(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY);
-  ASSERT_EQ(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY,
-            frame()->accessibility_mode());
+  const AccessibilityMode web_content_only_mode(
+      AccessibilityMode::kWebContents | AccessibilityMode::kInlineTextBoxes |
+      AccessibilityMode::kScreenReader | AccessibilityMode::kHTML);
+  frame()->SetAccessibilityMode(web_content_only_mode);
+  ASSERT_TRUE(frame()->accessibility_mode() == web_content_only_mode);
   ASSERT_TRUE(frame()->render_accessibility());
 
-  frame()->SetAccessibilityMode(AccessibilityModeOff);
-  ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
+  frame()->SetAccessibilityMode(AccessibilityMode());
+  ASSERT_TRUE(frame()->accessibility_mode().is_mode_off());
   ASSERT_FALSE(frame()->render_accessibility());
 
-  frame()->SetAccessibilityMode(ACCESSIBILITY_MODE_COMPLETE);
-  ASSERT_EQ(ACCESSIBILITY_MODE_COMPLETE, frame()->accessibility_mode());
+  const AccessibilityMode complete_mode(
+      AccessibilityMode::kNativeAPIs | AccessibilityMode::kWebContents |
+      AccessibilityMode::kInlineTextBoxes | AccessibilityMode::kScreenReader |
+      AccessibilityMode::kHTML);
+  frame()->SetAccessibilityMode(complete_mode);
+  ASSERT_TRUE(frame()->accessibility_mode() == complete_mode);
   ASSERT_TRUE(frame()->render_accessibility());
 }