Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/touch_accessibility_aura_browsertest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 16 matching lines @@
   TouchAccessibilityBrowserTest() {}
 
  protected:
   void SetUpOnMainThread() override {
     host_resolver()->AddRule("*", "127.0.0.1");
     SetupCrossSiteRedirector(embedded_test_server());
     ASSERT_TRUE(embedded_test_server()->Start());
   }
 
   void NavigateToUrlAndWaitForAccessibilityTree(const GURL& url) {
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(),
-        ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_LOAD_COMPLETE);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_LOAD_COMPLETE);
     NavigateToURL(shell(), url);
     waiter.WaitForNotification();
   }
 
   void SendTouchExplorationEvent(int x, int y) {
     aura::Window* window = shell()->web_contents()->GetContentNativeView();
     ui::EventProcessor* dispatcher = window->GetHost()->event_processor();
     gfx::Rect bounds = window->GetBoundsInRootWindow();
     gfx::Point location(bounds.x() + x,  bounds.y() + y);
     int flags = ui::EF_TOUCH_ACCESSIBILITY;
@@ skipping 35 matching lines @@
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       shell()->web_contents());
   BrowserAccessibilityManager* manager =
       web_contents->GetRootBrowserAccessibilityManager();
   ASSERT_NE(nullptr, manager);
 
   // Loop over all of the cells in the table. For each one, send a simulated
   // touch exploration event in the center of that cell, and assert that we
   // get an accessibility hover event fired in the correct cell.
   AccessibilityNotificationWaiter waiter(
-      shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE, ui::AX_EVENT_HOVER);
+      shell()->web_contents(), kAccessibilityModeComplete, ui::AX_EVENT_HOVER);
   for (int row = 0; row < 5; ++row) {
     for (int col = 0; col < 7; ++col) {
       std::string expected_cell_text = base::IntToString(row * 7 + col);
       VLOG(1) << "Sending event in row " << row << " col " << col
               << " with text " << expected_cell_text;
       SendTouchExplorationEvent(50 * col + 25, 50 * row + 25);
 
       // Wait until we get a hover event in the expected grid cell.
       // Tolerate additional events, keep looping until we get the expected one.
       std::string cell_text;
@@ skipping 68 matching lines @@
   SendTouchExplorationEvent(50, 350);
   waiter.WaitForNotification();
   int target_id = waiter.event_target_id();
   BrowserAccessibility* hit = child_manager->GetFromID(target_id);
   EXPECT_EQ(ui::AX_ROLE_BUTTON, hit->GetData().role);
   std::string text = hit->GetData().GetStringAttribute(ui::AX_ATTR_NAME);
   EXPECT_EQ("Ordinary Button", text);
 }
 
 }  // namespace content