Scope and clean up uses of AccessibilityMode.

content/browser/accessibility/accessibility_ipc_error_browsertest.cc

 // Copyright (c) 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 <stddef.h>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 42 matching lines @@
   NavigateToURL(shell(), url);
 
   // Simulate a condition where the RFH can't create a
   // BrowserAccessibilityManager - like if there's no view.
   RenderFrameHostImpl* frame = static_cast<RenderFrameHostImpl*>(
       shell()->web_contents()->GetMainFrame());
   frame->set_no_create_browser_accessibility_manager_for_testing(true);
   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();
   }
 
   // Make sure we still didn't create a BrowserAccessibilityManager.
   // This means that at least one accessibility IPC was lost.
   ASSERT_EQ(nullptr, frame->GetOrCreateBrowserAccessibilityManager());
 
   // Now create a BrowserAccessibilityManager, simulating what would happen
   // if the RFH's view is created now - but then disallow recreating the
   // BrowserAccessibilityManager so that we can test that this one gets
   // destroyed.
   frame->set_no_create_browser_accessibility_manager_for_testing(false);
   ASSERT_TRUE(frame->GetOrCreateBrowserAccessibilityManager() != nullptr);
   frame->set_no_create_browser_accessibility_manager_for_testing(true);
 
   {
     // 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();
   }
 
   // Show that accessibility was reset because the frame doesn't have a
   // BrowserAccessibilityManager anymore.
   ASSERT_EQ(nullptr, frame->browser_accessibility_manager());
 
   // Finally, allow creating a new accessibility manager and
   // ensure that we didn't kill the renderer; we can still send it messages.
   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();
     tree = &waiter.GetAXTree();
   }
 
   // Get the accessibility tree, ensure it reflects the final state of the
   // document.
   const ui::AXNode* root = tree->root();
 
@@ skipping 25 matching lines @@
   // Create a data url and load it.
   const char url_str[] =
       "data:text/html,"
       "<button id='button'>Button</button>";
   GURL url(url_str);
   NavigateToURL(shell(), url);
   RenderFrameHostImpl* frame = static_cast<RenderFrameHostImpl*>(
       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();
   }
 
   // Construct a bad accessibility message that BrowserAccessibilityManager
   // will reject.
   std::vector<AXEventNotificationDetails> bad_accessibility_event_list;
   bad_accessibility_event_list.push_back(AXEventNotificationDetails());
   bad_accessibility_event_list[0].update.node_id_to_clear = -2;
 
   // We should be able to reset accessibility |max_iterations-1| times
   // (see render_frame_host_impl.cc - kMaxAccessibilityResets),
   // but the subsequent time the renderer should be killed.
   int max_iterations = RenderFrameHostImpl::kMaxAccessibilityResets;
 
   for (int iteration = 0; iteration < max_iterations; iteration++) {
     // Send the browser accessibility the bad message.
     BrowserAccessibilityManager* manager =
         frame->GetOrCreateBrowserAccessibilityManager();
     manager->OnAccessibilityEvents(bad_accessibility_event_list);
 
     // Now the frame should have deleted the BrowserAccessibilityManager.
     ASSERT_EQ(nullptr, frame->browser_accessibility_manager());
 
     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();
   }
 
   // Wait for the renderer to be killed.
   if (frame->IsRenderFrameLive()) {
     RenderProcessHostWatcher render_process_watcher(
         frame->GetProcess(), RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     render_process_watcher.Wait();
   }
   ASSERT_FALSE(frame->IsRenderFrameLive());
 }
 
 }  // namespace content