Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/android_granularity_movement_browsertest.cc

 // Copyright 2014 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 <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 21 matching lines @@
 
 class AndroidGranularityMovementBrowserTest : public ContentBrowserTest {
  public:
   AndroidGranularityMovementBrowserTest() {}
   ~AndroidGranularityMovementBrowserTest() override {}
 
   BrowserAccessibility* LoadUrlAndGetAccessibilityRoot(const GURL& url) {
     NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
     // Load the page.
-    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();
 
     // Get the BrowserAccessibilityManager.
     WebContentsImpl* web_contents =
         static_cast<WebContentsImpl*>(shell()->web_contents());
     return web_contents->GetRootBrowserAccessibilityManager()->GetRoot();
   }
 
   // First, set accessibility focus to a node and wait for the update that
   // loads inline text boxes for that node. (We load inline text boxes
   // asynchronously on Android since we only ever need them for the node
   // with accessibility focus.)
   //
   // Then call NextAtGranularity repeatedly and return a string that
   // concatenates all of the text of the returned text ranges.
   //
   // As an example, if the node's text is "cat dog" and you traverse by
   // word, this returns "'cat', 'dog'".
   //
   // Also calls PreviousAtGranularity from the end back to the beginning
   // and fails (by logging an error and returning the empty string) if
   // the result when traversing backwards is not the same
   // (but in reverse order).
   base::string16 TraverseNodeAtGranularity(
       BrowserAccessibility* node,
       int granularity) {
-    AccessibilityNotificationWaiter waiter(
-        shell()->web_contents(), ACCESSIBILITY_MODE_COMPLETE,
-        ui::AX_EVENT_TREE_CHANGED);
+    AccessibilityNotificationWaiter waiter(shell()->web_contents(),
+                                           kAccessibilityModeComplete,
+                                           ui::AX_EVENT_TREE_CHANGED);
     node->manager()->SetAccessibilityFocus(*node);
     waiter.WaitForNotification();
 
     int start_index = -1;
     int end_index = -1;
     BrowserAccessibilityAndroid* android_node =
         static_cast<BrowserAccessibilityAndroid*>(node);
     BrowserAccessibilityManagerAndroid* manager =
         static_cast<BrowserAccessibilityManagerAndroid*>(node->manager());
     base::string16 text = android_node->GetText();
@@ skipping 120 matching lines @@
   BrowserAccessibility* root = LoadUrlAndGetAccessibilityRoot(url);
   ASSERT_EQ(1U, root->PlatformChildCount());
   BrowserAccessibility* pre = root->PlatformGetChild(0);
   ASSERT_EQ(0U, pre->PlatformChildCount());
 
   ASSERT_EQ(base::ASCIIToUTF16("'One,', 'two,', 'three!'"),
             TraverseNodeAtGranularity(pre, GRANULARITY_LINE));
 }
 
 }  // namespace content