Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/accessibility_ipc_error_browsertest.cc

Index: content/browser/accessibility/accessibility_ipc_error_browsertest.cc
diff --git a/content/browser/accessibility/accessibility_ipc_error_browsertest.cc b/content/browser/accessibility/accessibility_ipc_error_browsertest.cc
index cb4d55bff638528a2ffc41a691b792e53a6b4115..6d1caeb7fddeb8e7f8529a7cf82f784da048c225 100644
--- a/content/browser/accessibility/accessibility_ipc_error_browsertest.cc
+++ b/content/browser/accessibility/accessibility_ipc_error_browsertest.cc
@@ -60,13 +60,12 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
   ASSERT_EQ(nullptr, frame->GetOrCreateBrowserAccessibilityManager());
 
   {
-    // Enable accessibility (passing ACCESSIBILITY_MODE_COMPLETE to
+    // Enable accessibility (passing kAccessibilityModeComplete to
     // AccessibilityNotificationWaiter does this automatically) and wait for
     // the first event.
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(),
-        ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_LAYOUT_COMPLETE);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_LAYOUT_COMPLETE);
     waiter.WaitForNotification();
   }
 
@@ -85,10 +84,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
   {
     // Hide one of the elements on the page, and wait for an accessibility
     // notification triggered by the hide.
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(),
-        ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_LIVE_REGION_CHANGED);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_LIVE_REGION_CHANGED);
     ASSERT_TRUE(ExecuteScript(
         shell(), "document.getElementById('p1').style.display = 'none';"));
     waiter.WaitForNotification();
@@ -103,9 +101,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
   frame->set_no_create_browser_accessibility_manager_for_testing(false);
   const ui::AXTree* tree = nullptr;
   {
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_FOCUS);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_FOCUS);
     ASSERT_TRUE(
         ExecuteScript(shell(), "document.getElementById('button').focus();"));
     waiter.WaitForNotification();
@@ -151,13 +149,12 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
       shell()->web_contents()->GetMainFrame());
 
   {
-    // Enable accessibility (passing ACCESSIBILITY_MODE_COMPLETE to
+    // Enable accessibility (passing kAccessibilityModeComplete to
     // AccessibilityNotificationWaiter does this automatically) and wait for
     // the first event.
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(),
-        ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_LAYOUT_COMPLETE);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_LAYOUT_COMPLETE);
     waiter.WaitForNotification();
   }
 
@@ -184,10 +181,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityIpcErrorBrowserTest,
     if (iteration == max_iterations - 1)
       break;
 
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(),
-        ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_LOAD_COMPLETE);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_LOAD_COMPLETE);
     waiter.WaitForNotification();
   }