Scope and clean up uses of AccessibilityMode.

content/renderer/render_view_browsertest.cc

 // Copyright (c) 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 <stddef.h>
 #include <stdint.h>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #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"
 #include "content/common/frame_replication_state.h"
 #include "content/common/renderer.mojom.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_ui_controller_factory.h"
@@ skipping 1930 matching lines @@
   request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
   blink::WebURLResponse redirect_response;
   frame()->willSendRequest(GetMainFrame(), request);
   extra_data = static_cast<RequestExtraData*>(request.getExtraData());
   ASSERT_TRUE(extra_data);
   EXPECT_EQ(extra_data->service_worker_provider_id(),
             provider->provider_id());
 }
 
 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());
 }
 
 // Checks that when a navigation starts in the renderer, |navigation_start| is
 // recorded at an appropriate time and is passed in the corresponding message.
 TEST_F(RenderViewImplTest, RendererNavigationStartTransmittedToBrowser) {
   base::TimeTicks lower_bound_navigation_start(base::TimeTicks::Now());
   frame()->GetWebFrame()->loadHTMLString(
       "hello world", blink::WebURL(GURL("data:text/html,")));
 
@@ skipping 564 matching lines @@
   ExpectPauseAndResume(3);
   blink::WebScriptSource source2(
       WebString::fromUTF8("function func2() { func1(); }; func2();"));
   frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
 
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content