Refactor content/ to use ui::AXNodeData instead of blink.

content/test/accessibility_browser_test_utils.h

Index: content/test/accessibility_browser_test_utils.h
diff --git a/content/test/accessibility_browser_test_utils.h b/content/test/accessibility_browser_test_utils.h
index 74f08342bf501c88d9c7490fe2becca78de8a78e..25abe20b6b88318bbd93343e4739a9c00f854b06 100644
--- a/content/test/accessibility_browser_test_utils.h
+++ b/content/test/accessibility_browser_test_utils.h
@@ -6,8 +6,9 @@
 #define CONTENT_TEST_ACCESSIBILITY_BROWSER_TEST_UTILS_H_
 
 #include "base/memory/weak_ptr.h"
-#include "content/common/accessibility_node_data.h"
 #include "content/common/view_message_enums.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/ax_tree.h"
 
 namespace content {
 
@@ -25,7 +26,7 @@ class AccessibilityNotificationWaiter {
   AccessibilityNotificationWaiter(
       Shell* shell,
       AccessibilityMode accessibility_mode,
-      blink::WebAXEvent event);
+      ui::AXEvent event);
   ~AccessibilityNotificationWaiter();
 
   // Blocks until the specific accessibility notification registered in
@@ -35,20 +36,19 @@ class AccessibilityNotificationWaiter {
 
   // After WaitForNotification has returned, this will retrieve
   // the tree of accessibility nodes received from the renderer process.
-  const AccessibilityNodeDataTreeNode& GetAccessibilityNodeDataTree() const;
+  const ui::AXTree& GetAXTree() const;
 
  private:
   // Callback from RenderViewHostImpl.
-  void OnAccessibilityEvent(blink::WebAXEvent event);
+  void OnAccessibilityEvent(ui::AXEvent event);
 
   // Helper function to determine if the accessibility tree in
-  // GetAccessibilityNodeDataTree() is about the page with the url
-  // "about:blank".
+  // GetAXTree() is about the page with the url "about:blank".
   bool IsAboutBlank();
 
   Shell* shell_;
   RenderViewHostImpl* view_host_;
-  blink::WebAXEvent event_to_wait_for_;
+  ui::AXEvent event_to_wait_for_;
   scoped_refptr<MessageLoopRunner> loop_runner_;
   base::WeakPtrFactory<AccessibilityNotificationWaiter> weak_factory_;