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

This is a huge change, but it's all refactoring / renaming.
There should be no new logic.

BUG=316726
R=dtseng@chromium.org, jam@chromium.org, tsepez@chromium.org

Review URL: https://codereview.chromium.org/116293005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243187 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 14 deletions

diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc
index 525ed30..67e5811 100644
--- a/content/test/accessibility_browser_test_utils.cc
+++ b/content/test/accessibility_browser_test_utils.cc
@@ -14,13 +14,14 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
+#include "ui/accessibility/ax_node.h"
 
 namespace content {
 
 AccessibilityNotificationWaiter::AccessibilityNotificationWaiter(
     Shell* shell,
     AccessibilityMode accessibility_mode,
-    blink::WebAXEvent event_type)
+    ui::AXEvent event_type)
     : shell_(shell),
       event_to_wait_for_(event_type),
       loop_runner_(new MessageLoopRunner()),
@@ -41,13 +42,12 @@ void AccessibilityNotificationWaiter::WaitForNotification() {
   loop_runner_->Run();
 }
 
-const AccessibilityNodeDataTreeNode&
-AccessibilityNotificationWaiter::GetAccessibilityNodeDataTree() const {
-  return view_host_->accessibility_tree_for_testing();
+const ui::AXTree& AccessibilityNotificationWaiter::GetAXTree() const {
+  return view_host_->ax_tree_for_testing();
 }
 
 void AccessibilityNotificationWaiter::OnAccessibilityEvent(
-    blink::WebAXEvent event_type) {
+    ui::AXEvent event_type) {
   if (!IsAboutBlank() && event_to_wait_for_ == event_type)
     loop_runner_->Quit();
 }
@@ -56,9 +56,9 @@ bool AccessibilityNotificationWaiter::IsAboutBlank() {
   // Skip any accessibility notifications related to "about:blank",
   // to avoid a possible race condition between the test beginning
   // listening for accessibility events and "about:blank" loading.
-  const AccessibilityNodeDataTreeNode& root = GetAccessibilityNodeDataTree();
+  const ui::AXNodeData& root = GetAXTree().GetRoot()->data();
   for (size_t i = 0; i < root.string_attributes.size(); ++i) {
-    if (root.string_attributes[i].first != AccessibilityNodeData::ATTR_DOC_URL)
+    if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL)
       continue;
     const std::string& doc_url = root.string_attributes[i].second;
     return doc_url == kAboutBlankURL;
diff --git a/content/test/accessibility_browser_test_utils.h b/content/test/accessibility_browser_test_utils.h
index 74f0834..25abe20 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_;