Index: content/test/accessibility_browser_test_utils.cc |
diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc |
index 525ed3026a257607ea7026eed6024a9c94665ea7..67e58117a48565c1356cbd0706bff4a441e20445 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; |