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

content/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2012 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 "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
-#include "content/common/accessibility_node_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
 // Subclass of BrowserAccessibility that counts the number of instances.
 class CountedBrowserAccessibility : public BrowserAccessibility {
  public:
   CountedBrowserAccessibility() {
     global_obj_count_++;
@@ skipping 59 matching lines @@
   bool got_fatal_error() const { return got_fatal_error_; }
   void reset_got_fatal_error() { got_fatal_error_ = false; }
 
 private:
   bool got_fatal_error_;
 };
 
 }  // anonymous namespace
 
 TEST(BrowserAccessibilityManagerTest, TestNoLeaks) {
-  // Create AccessibilityNodeData objects for a simple document tree,
+  // Create ui::AXNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
-  AccessibilityNodeData button;
+  ui::AXNodeData button;
   button.id = 2;
   button.SetName("Button");
-  button.role = blink::WebAXRoleButton;
+  button.role = ui::AX_ROLE_BUTTON;
   button.state = 0;
 
-  AccessibilityNodeData checkbox;
+  ui::AXNodeData checkbox;
   checkbox.id = 3;
   checkbox.SetName("Checkbox");
-  checkbox.role = blink::WebAXRoleCheckBox;
+  checkbox.role = ui::AX_ROLE_CHECK_BOX;
   checkbox.state = 0;
 
-  AccessibilityNodeData root;
+  ui::AXNodeData root;
   root.id = 1;
   root.SetName("Document");
-  root.role = blink::WebAXRoleRootWebArea;
+  root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with this
-  // AccessibilityNodeData tree and a factory for an instance-counting
+  // ui::AXNodeData tree and a factory for an instance-counting
   // BrowserAccessibility, and ensure that exactly 3 instances were
   // created. Note that the manager takes ownership of the factory.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           root,
           NULL,
           new CountedBrowserAccessibilityFactory());
   manager->UpdateNodesForTesting(button, checkbox);
 
@@ skipping 37 matching lines @@
 TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) {
   // Make sure that changes to a subtree reuse as many objects as possible.
 
   // Tree 1:
   //
   // root
   //   child1
   //   child2
   //   child3
 
-  AccessibilityNodeData tree1_child1;
+  ui::AXNodeData tree1_child1;
   tree1_child1.id = 2;
   tree1_child1.SetName("Child1");
-  tree1_child1.role = blink::WebAXRoleButton;
+  tree1_child1.role = ui::AX_ROLE_BUTTON;
   tree1_child1.state = 0;
 
-  AccessibilityNodeData tree1_child2;
+  ui::AXNodeData tree1_child2;
   tree1_child2.id = 3;
   tree1_child2.SetName("Child2");
-  tree1_child2.role = blink::WebAXRoleButton;
+  tree1_child2.role = ui::AX_ROLE_BUTTON;
   tree1_child2.state = 0;
 
-  AccessibilityNodeData tree1_child3;
+  ui::AXNodeData tree1_child3;
   tree1_child3.id = 4;
   tree1_child3.SetName("Child3");
-  tree1_child3.role = blink::WebAXRoleButton;
+  tree1_child3.role = ui::AX_ROLE_BUTTON;
   tree1_child3.state = 0;
 
-  AccessibilityNodeData tree1_root;
+  ui::AXNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
-  tree1_root.role = blink::WebAXRoleRootWebArea;
+  tree1_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
   tree1_root.child_ids.push_back(3);
   tree1_root.child_ids.push_back(4);
 
   // Tree 2:
   //
   // root
   //   child0  <-- inserted
   //   child1
   //   child2
   //           <-- child3 deleted
 
-  AccessibilityNodeData tree2_child0;
+  ui::AXNodeData tree2_child0;
   tree2_child0.id = 5;
   tree2_child0.SetName("Child0");
-  tree2_child0.role = blink::WebAXRoleButton;
+  tree2_child0.role = ui::AX_ROLE_BUTTON;
   tree2_child0.state = 0;
 
-  AccessibilityNodeData tree2_root;
+  ui::AXNodeData tree2_root;
   tree2_root.id = 1;
   tree2_root.SetName("DocumentChanged");
-  tree2_root.role = blink::WebAXRoleRootWebArea;
+  tree2_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   tree2_root.state = 0;
   tree2_root.child_ids.push_back(5);
   tree2_root.child_ids.push_back(2);
   tree2_root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_root,
@@ skipping 21 matching lines @@
 
   // Check the index in parent.
   EXPECT_EQ(0, child1_accessible->index_in_parent());
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
-  msg->event_type = blink::WebAXEventChildrenChanged;
+  msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
   msg->nodes.push_back(tree2_root);
   msg->nodes.push_back(tree2_child0);
   msg->id = tree2_root.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 5 objects now: the 4 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(5, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root, child1, and child2 are still valid,
@@ skipping 28 matching lines @@
   //
   // root
   //   container
   //     child1
   //       grandchild1
   //     child2
   //       grandchild2
   //     child3
   //       grandchild3
 
-  AccessibilityNodeData tree1_grandchild1;
+  ui::AXNodeData tree1_grandchild1;
   tree1_grandchild1.id = 4;
   tree1_grandchild1.SetName("GrandChild1");
-  tree1_grandchild1.role = blink::WebAXRoleButton;
+  tree1_grandchild1.role = ui::AX_ROLE_BUTTON;
   tree1_grandchild1.state = 0;
 
-  AccessibilityNodeData tree1_child1;
+  ui::AXNodeData tree1_child1;
   tree1_child1.id = 3;
   tree1_child1.SetName("Child1");
-  tree1_child1.role = blink::WebAXRoleButton;
+  tree1_child1.role = ui::AX_ROLE_BUTTON;
   tree1_child1.state = 0;
   tree1_child1.child_ids.push_back(4);
 
-  AccessibilityNodeData tree1_grandchild2;
+  ui::AXNodeData tree1_grandchild2;
   tree1_grandchild2.id = 6;
   tree1_grandchild2.SetName("GrandChild1");
-  tree1_grandchild2.role = blink::WebAXRoleButton;
+  tree1_grandchild2.role = ui::AX_ROLE_BUTTON;
   tree1_grandchild2.state = 0;
 
-  AccessibilityNodeData tree1_child2;
+  ui::AXNodeData tree1_child2;
   tree1_child2.id = 5;
   tree1_child2.SetName("Child2");
-  tree1_child2.role = blink::WebAXRoleButton;
+  tree1_child2.role = ui::AX_ROLE_BUTTON;
   tree1_child2.state = 0;
   tree1_child2.child_ids.push_back(6);
 
-  AccessibilityNodeData tree1_grandchild3;
+  ui::AXNodeData tree1_grandchild3;
   tree1_grandchild3.id = 8;
   tree1_grandchild3.SetName("GrandChild3");
-  tree1_grandchild3.role = blink::WebAXRoleButton;
+  tree1_grandchild3.role = ui::AX_ROLE_BUTTON;
   tree1_grandchild3.state = 0;
 
-  AccessibilityNodeData tree1_child3;
+  ui::AXNodeData tree1_child3;
   tree1_child3.id = 7;
   tree1_child3.SetName("Child3");
-  tree1_child3.role = blink::WebAXRoleButton;
+  tree1_child3.role = ui::AX_ROLE_BUTTON;
   tree1_child3.state = 0;
   tree1_child3.child_ids.push_back(8);
 
-  AccessibilityNodeData tree1_container;
+  ui::AXNodeData tree1_container;
   tree1_container.id = 2;
   tree1_container.SetName("Container");
-  tree1_container.role = blink::WebAXRoleGroup;
+  tree1_container.role = ui::AX_ROLE_GROUP;
   tree1_container.state = 0;
   tree1_container.child_ids.push_back(3);
   tree1_container.child_ids.push_back(5);
   tree1_container.child_ids.push_back(7);
 
-  AccessibilityNodeData tree1_root;
+  ui::AXNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
-  tree1_root.role = blink::WebAXRoleRootWebArea;
+  tree1_root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
 
   // Tree 2:
   //
   // root
   //   container
   //     child0         <-- inserted
   //       grandchild0  <--
   //     child1
   //       grandchild1
   //     child2
   //       grandchild2
   //                    <-- child3 (and grandchild3) deleted
 
-  AccessibilityNodeData tree2_grandchild0;
+  ui::AXNodeData tree2_grandchild0;
   tree2_grandchild0.id = 9;
   tree2_grandchild0.SetName("GrandChild0");
-  tree2_grandchild0.role = blink::WebAXRoleButton;
+  tree2_grandchild0.role = ui::AX_ROLE_BUTTON;
   tree2_grandchild0.state = 0;
 
-  AccessibilityNodeData tree2_child0;
+  ui::AXNodeData tree2_child0;
   tree2_child0.id = 10;
   tree2_child0.SetName("Child0");
-  tree2_child0.role = blink::WebAXRoleButton;
+  tree2_child0.role = ui::AX_ROLE_BUTTON;
   tree2_child0.state = 0;
   tree2_child0.child_ids.push_back(9);
 
-  AccessibilityNodeData tree2_container;
+  ui::AXNodeData tree2_container;
   tree2_container.id = 2;
   tree2_container.SetName("Container");
-  tree2_container.role = blink::WebAXRoleGroup;
+  tree2_container.role = ui::AX_ROLE_GROUP;
   tree2_container.state = 0;
   tree2_container.child_ids.push_back(10);
   tree2_container.child_ids.push_back(3);
   tree2_container.child_ids.push_back(5);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_root,
@@ skipping 24 matching lines @@
 
   // Check the index in parent.
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree rooted at
   // the container.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
-  msg->event_type = blink::WebAXEventChildrenChanged;
+  msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
   msg->nodes.push_back(tree2_container);
   msg->nodes.push_back(tree2_child0);
   msg->nodes.push_back(tree2_grandchild0);
   msg->id = tree2_container.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 9 objects now: the 8 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(9, CountedBrowserAccessibility::global_obj_count_);
 
@@ skipping 26 matching lines @@
 }
 
 TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) {
   // Tree 1:
   //
   // 1
   //   2
   //   3
   //     4
 
-  AccessibilityNodeData tree1_4;
+  ui::AXNodeData tree1_4;
   tree1_4.id = 4;
   tree1_4.state = 0;
 
-  AccessibilityNodeData tree1_3;
+  ui::AXNodeData tree1_3;
   tree1_3.id = 3;
   tree1_3.state = 0;
   tree1_3.child_ids.push_back(4);
 
-  AccessibilityNodeData tree1_2;
+  ui::AXNodeData tree1_2;
   tree1_2.id = 2;
   tree1_2.state = 0;
 
-  AccessibilityNodeData tree1_1;
+  ui::AXNodeData tree1_1;
   tree1_1.id = 1;
-  tree1_1.role = blink::WebAXRoleRootWebArea;
+  tree1_1.role = ui::AX_ROLE_ROOT_WEB_AREA;
   tree1_1.state = 0;
   tree1_1.child_ids.push_back(2);
   tree1_1.child_ids.push_back(3);
 
   // Tree 2:
   //
   // 1
   //   4    <-- moves up a level and gains child
   //     6  <-- new
   //   5    <-- new
 
-  AccessibilityNodeData tree2_6;
+  ui::AXNodeData tree2_6;
   tree2_6.id = 6;
   tree2_6.state = 0;
 
-  AccessibilityNodeData tree2_5;
+  ui::AXNodeData tree2_5;
   tree2_5.id = 5;
   tree2_5.state = 0;
 
-  AccessibilityNodeData tree2_4;
+  ui::AXNodeData tree2_4;
   tree2_4.id = 4;
   tree2_4.state = 0;
   tree2_4.child_ids.push_back(6);
 
-  AccessibilityNodeData tree2_1;
+  ui::AXNodeData tree2_1;
   tree2_1.id = 1;
   tree2_1.state = 0;
   tree2_1.child_ids.push_back(4);
   tree2_1.child_ids.push_back(5);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_1,
           NULL,
           new CountedBrowserAccessibilityFactory());
   manager->UpdateNodesForTesting(tree1_2, tree1_3, tree1_4);
   ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Process a notification containing the changed subtree.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
-  msg->event_type = blink::WebAXEventChildrenChanged;
+  msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
   msg->nodes.push_back(tree2_1);
   msg->nodes.push_back(tree2_4);
   msg->nodes.push_back(tree2_5);
   msg->nodes.push_back(tree2_6);
   msg->id = tree2_1.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 4 objects now.
   EXPECT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Delete the manager and make sure all memory is cleaned up.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }
 
 // Crashes on Windows. http://crbug.com/304130
 #if defined(OS_WIN)
 #define MAYBE_TestFatalError DISABLED_TestFatalError
 #else
 #define MAYBE_TestFatalError TestFatalError
 #endif
 TEST(BrowserAccessibilityManagerTest, MAYBE_TestFatalError) {
   // Test that BrowserAccessibilityManager raises a fatal error
   // (which will crash the renderer) if the same id is used in
   // two places in the tree.
 
-  AccessibilityNodeData root;
+  ui::AXNodeData root;
   root.id = 1;
-  root.role = blink::WebAXRoleRootWebArea;
+  root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.child_ids.push_back(2);
   root.child_ids.push_back(2);
 
   CountedBrowserAccessibilityFactory* factory =
       new CountedBrowserAccessibilityFactory();
   scoped_ptr<TestBrowserAccessibilityDelegate> delegate(
       new TestBrowserAccessibilityDelegate());
   scoped_ptr<BrowserAccessibilityManager> manager;
   ASSERT_FALSE(delegate->got_fatal_error());
   manager.reset(BrowserAccessibilityManager::Create(
       root,
       delegate.get(),
       factory));
   ASSERT_TRUE(delegate->got_fatal_error());
 
-  AccessibilityNodeData root2;
+  ui::AXNodeData root2;
   root2.id = 1;
-  root2.role = blink::WebAXRoleRootWebArea;
+  root2.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root2.child_ids.push_back(2);
   root2.child_ids.push_back(3);
 
-  AccessibilityNodeData child1;
+  ui::AXNodeData child1;
   child1.id = 2;
   child1.child_ids.push_back(4);
   child1.child_ids.push_back(5);
 
-  AccessibilityNodeData child2;
+  ui::AXNodeData child2;
   child2.id = 3;
   child2.child_ids.push_back(6);
   child2.child_ids.push_back(5);  // Duplicate
 
   delegate->reset_got_fatal_error();
   factory = new CountedBrowserAccessibilityFactory();
   manager.reset(BrowserAccessibilityManager::Create(
       root2,
       delegate.get(),
       factory));
   ASSERT_FALSE(delegate->got_fatal_error());
   manager->UpdateNodesForTesting(child1, child2);
   ASSERT_TRUE(delegate->got_fatal_error());
 }
 
 TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
-  AccessibilityNodeData root;
+  ui::AXNodeData root;
   root.id = 1;
-  root.role = blink::WebAXRoleRootWebArea;
+  root.role = ui::AX_ROLE_ROOT_WEB_AREA;
 
-  AccessibilityNodeData static_text;
+  ui::AXNodeData static_text;
   static_text.id = 2;
   static_text.SetValue("Hello, world.");
-  static_text.role = blink::WebAXRoleStaticText;
+  static_text.role = ui::AX_ROLE_STATIC_TEXT;
   static_text.location = gfx::Rect(100, 100, 29, 18);
   root.child_ids.push_back(2);
 
-  AccessibilityNodeData inline_text1;
+  ui::AXNodeData inline_text1;
   inline_text1.id = 3;
   inline_text1.SetValue("Hello, ");
-  inline_text1.role = blink::WebAXRoleInlineTextBox;
+  inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 29, 9);
-  inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionLR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(6);   // 0
   character_offsets1.push_back(11);  // 1
   character_offsets1.push_back(16);  // 2
   character_offsets1.push_back(21);  // 3
   character_offsets1.push_back(26);  // 4
   character_offsets1.push_back(29);  // 5
   character_offsets1.push_back(29);  // 6 (note that the space has no width)
   inline_text1.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets1);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets1);
   static_text.child_ids.push_back(3);
 
-  AccessibilityNodeData inline_text2;
+  ui::AXNodeData inline_text2;
   inline_text2.id = 4;
   inline_text2.SetValue("world.");
-  inline_text2.role = blink::WebAXRoleInlineTextBox;
+  inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(100, 109, 28, 9);
-  inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionLR);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(5);
   character_offsets2.push_back(10);
   character_offsets2.push_back(15);
   character_offsets2.push_back(20);
   character_offsets2.push_back(25);
   character_offsets2.push_back(28);
   inline_text2.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets2);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
   static_text.child_ids.push_back(4);
 
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           root,
           NULL,
           new CountedBrowserAccessibilityFactory()));
   manager->UpdateNodesForTesting(static_text, inline_text1, inline_text2);
 
   BrowserAccessibility* root_accessible = manager->GetRoot();
@@ skipping 30 matching lines @@
 
 TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
   // In this example, we assume that the string "123abc" is rendered with
   // "123" going left-to-right and "abc" going right-to-left. In other
   // words, on-screen it would look like "123cba". This is possible to
   // acheive if the source string had unicode control characters
   // to switch directions. This test doesn't worry about how, though - it just
   // tests that if something like that were to occur, GetLocalBoundsForRange
   // returns the correct bounds for different ranges.
 
-  AccessibilityNodeData root;
+  ui::AXNodeData root;
   root.id = 1;
-  root.role = blink::WebAXRoleRootWebArea;
+  root.role = ui::AX_ROLE_ROOT_WEB_AREA;
 
-  AccessibilityNodeData static_text;
+  ui::AXNodeData static_text;
   static_text.id = 2;
   static_text.SetValue("123abc");
-  static_text.role = blink::WebAXRoleStaticText;
+  static_text.role = ui::AX_ROLE_STATIC_TEXT;
   static_text.location = gfx::Rect(100, 100, 60, 20);
   root.child_ids.push_back(2);
 
-  AccessibilityNodeData inline_text1;
+  ui::AXNodeData inline_text1;
   inline_text1.id = 3;
   inline_text1.SetValue("123");
-  inline_text1.role = blink::WebAXRoleInlineTextBox;
+  inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 30, 20);
-  inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionLR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(10);  // 0
   character_offsets1.push_back(20);  // 1
   character_offsets1.push_back(30);  // 2
   inline_text1.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets1);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets1);
   static_text.child_ids.push_back(3);
 
-  AccessibilityNodeData inline_text2;
+  ui::AXNodeData inline_text2;
   inline_text2.id = 4;
   inline_text2.SetValue("abc");
-  inline_text2.role = blink::WebAXRoleInlineTextBox;
+  inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(130, 100, 30, 20);
-  inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionRL);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(10);
   character_offsets2.push_back(20);
   character_offsets2.push_back(30);
   inline_text2.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets2);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
   static_text.child_ids.push_back(4);
 
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           root,
           NULL,
           new CountedBrowserAccessibilityFactory()));
   manager->UpdateNodesForTesting(static_text, inline_text1, inline_text2);
 
   BrowserAccessibility* root_accessible = manager->GetRoot();
@@ skipping 21 matching lines @@
             static_text_accessible->GetLocalBoundsForRange(2, 2).ToString());
 }
 
 #if defined(OS_WIN)
 #define MAYBE_BoundsForRangeOnParentElement \
   DISABLED_BoundsForRangeOnParentElement
 #else
 #define MAYBE_BoundsForRangeOnParentElement BoundsForRangeOnParentElement
 #endif
 TEST(BrowserAccessibilityManagerTest, MAYBE_BoundsForRangeOnParentElement) {
-  AccessibilityNodeData root;
+  ui::AXNodeData root;
   root.id = 1;
-  root.role = blink::WebAXRoleRootWebArea;
+  root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.child_ids.push_back(2);
 
-  AccessibilityNodeData div;
+  ui::AXNodeData div;
   div.id = 2;
-  div.role = blink::WebAXRoleDiv;
+  div.role = ui::AX_ROLE_DIV;
   div.location = gfx::Rect(100, 100, 100, 20);
   div.child_ids.push_back(3);
   div.child_ids.push_back(4);
   div.child_ids.push_back(5);
 
-  AccessibilityNodeData static_text1;
+  ui::AXNodeData static_text1;
   static_text1.id = 3;
   static_text1.SetValue("AB");
-  static_text1.role = blink::WebAXRoleStaticText;
+  static_text1.role = ui::AX_ROLE_STATIC_TEXT;
   static_text1.location = gfx::Rect(100, 100, 40, 20);
   static_text1.child_ids.push_back(6);
 
-  AccessibilityNodeData img;
+  ui::AXNodeData img;
   img.id = 4;
-  img.role = blink::WebAXRoleImage;
+  img.role = ui::AX_ROLE_IMAGE;
   img.location = gfx::Rect(140, 100, 20, 20);
 
-  AccessibilityNodeData static_text2;
+  ui::AXNodeData static_text2;
   static_text2.id = 5;
   static_text2.SetValue("CD");
-  static_text2.role = blink::WebAXRoleStaticText;
+  static_text2.role = ui::AX_ROLE_STATIC_TEXT;
   static_text2.location = gfx::Rect(160, 100, 40, 20);
   static_text2.child_ids.push_back(7);
 
-  AccessibilityNodeData inline_text1;
+  ui::AXNodeData inline_text1;
   inline_text1.id = 6;
   inline_text1.SetValue("AB");
-  inline_text1.role = blink::WebAXRoleInlineTextBox;
+  inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text1.location = gfx::Rect(100, 100, 40, 20);
-  inline_text1.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionLR);
   std::vector<int32> character_offsets1;
   character_offsets1.push_back(20);  // 0
   character_offsets1.push_back(40);  // 1
   inline_text1.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets1);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets1);
 
-  AccessibilityNodeData inline_text2;
+  ui::AXNodeData inline_text2;
   inline_text2.id = 7;
   inline_text2.SetValue("CD");
-  inline_text2.role = blink::WebAXRoleInlineTextBox;
+  inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
   inline_text2.location = gfx::Rect(160, 100, 40, 20);
-  inline_text2.AddIntAttribute(AccessibilityNodeData::ATTR_TEXT_DIRECTION,
+  inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                                blink::WebAXTextDirectionLR);
   std::vector<int32> character_offsets2;
   character_offsets2.push_back(20);  // 0
   character_offsets2.push_back(40);  // 1
   inline_text2.AddIntListAttribute(
-      AccessibilityNodeData::ATTR_CHARACTER_OFFSETS, character_offsets2);
+      ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
 
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
           root,
           NULL,
           new CountedBrowserAccessibilityFactory()));
   manager->UpdateNodesForTesting(
       div, static_text1, img, static_text2, inline_text1, inline_text2);
 
   BrowserAccessibility* root_accessible = manager->GetRoot();
@@ skipping 11 matching lines @@
             root_accessible->GetLocalBoundsForRange(1, 2).ToString());
 
   EXPECT_EQ(gfx::Rect(120, 100, 80, 20).ToString(),
             root_accessible->GetLocalBoundsForRange(1, 3).ToString());
 
   EXPECT_EQ(gfx::Rect(100, 100, 100, 20).ToString(),
             root_accessible->GetLocalBoundsForRange(0, 4).ToString());
 }
 
 }  // namespace content