Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/hit_testing_browsertest.cc

Index: content/browser/accessibility/hit_testing_browsertest.cc
diff --git a/content/browser/accessibility/hit_testing_browsertest.cc b/content/browser/accessibility/hit_testing_browsertest.cc
index afcb4f6eba18886556027c076c0b7402d2ac9693..34a4b24f54d7eccdcca8fd21cd6e0553d968c3a3 100644
--- a/content/browser/accessibility/hit_testing_browsertest.cc
+++ b/content/browser/accessibility/hit_testing_browsertest.cc
@@ -30,9 +30,9 @@ class AccessibilityHitTestingBrowserTest : public ContentBrowserTest {
     BrowserAccessibilityManager* manager =
         web_contents->GetRootBrowserAccessibilityManager();
 
-    AccessibilityNotificationWaiter hover_waiter(
-        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_HOVER);
+    AccessibilityNotificationWaiter hover_waiter(shell()->web_contents(),
+                                                 AccessibilityMode::kComplete,

[dmazzoni, 2017/02/23 17:08:21]

This function must be taking an int, but it should be taking
an AccessibilityMode. See my other comment, we should have
constants for common AccessibilityModes that are of *type*
AccessibilityMode, rather than mode flags.

+                                                 ui::AX_EVENT_HOVER);
     for (FrameTreeNode* node : frame_tree->Nodes())
       hover_waiter.ListenToAdditionalFrame(node->current_frame_host());
     manager->HitTest(point);
@@ -58,9 +58,9 @@ class AccessibilityHitTestingBrowserTest : public ContentBrowserTest {
 
     // Each call to CachingAsyncHitTest results in at least one HOVER
     // event received. Block until we receive it.
-    AccessibilityNotificationWaiter hover_waiter(
-        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_HOVER);
+    AccessibilityNotificationWaiter hover_waiter(shell()->web_contents(),
+                                                 AccessibilityMode::kComplete,
+                                                 ui::AX_EVENT_HOVER);
     for (FrameTreeNode* node : frame_tree->Nodes())
       hover_waiter.ListenToAdditionalFrame(node->current_frame_host());
     BrowserAccessibility* result = manager->CachingAsyncHitTest(screen_point);
@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
 
   // Load the page.
   AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-                                         ACCESSIBILITY_MODE_COMPLETE,
+                                         AccessibilityMode::kComplete,
                                          ui::AX_EVENT_LOAD_COMPLETE);
   const char url_str[] =
       "data:text/html,"
@@ -104,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-                                         ACCESSIBILITY_MODE_COMPLETE,
+                                         AccessibilityMode::kComplete,
                                          ui::AX_EVENT_LOAD_COMPLETE);
   GURL url(embedded_test_server()->GetURL(
       "/accessibility/html/iframe-coordinates.html"));
@@ -160,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   AccessibilityNotificationWaiter waiter(shell()->web_contents(),
-                                         ACCESSIBILITY_MODE_COMPLETE,
+                                         AccessibilityMode::kComplete,
                                          ui::AX_EVENT_LOAD_COMPLETE);
   GURL url(embedded_test_server()->GetURL(
       "/accessibility/hit_testing/hit_testing.html"));