Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_manager_unittest.cc

Index: content/browser/accessibility/browser_accessibility_manager_unittest.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
index 5e238a04b5c1771dbb03bf08746231d061638e76..3cfeb5549022a2ef6378ea04ae42234f54d1be0f 100644
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -258,9 +258,9 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) {
   child3_accessible->NativeAddReference();
 
   // 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());
+  EXPECT_EQ(0, child1_accessible->GetIndexInParent());
+  EXPECT_EQ(1, child2_accessible->GetIndexInParent());
+  EXPECT_EQ(2, child3_accessible->GetIndexInParent());
 
   // Process a notification containing the changed subtree.
   std::vector<AccessibilityHostMsg_EventParams> params;
@@ -284,8 +284,8 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) {
   EXPECT_FALSE(child3_accessible->instance_active());
 
   // Check that the index in parent has been updated.
-  EXPECT_EQ(1, child1_accessible->index_in_parent());
-  EXPECT_EQ(2, child2_accessible->index_in_parent());
+  EXPECT_EQ(1, child1_accessible->GetIndexInParent());
+  EXPECT_EQ(2, child2_accessible->GetIndexInParent());
 
   // Release our references. The object count should only decrease by 1
   // for child3.
@@ -435,8 +435,8 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) {
   child3_accessible->NativeAddReference();
 
   // Check the index in parent.
-  EXPECT_EQ(1, child2_accessible->index_in_parent());
-  EXPECT_EQ(2, child3_accessible->index_in_parent());
+  EXPECT_EQ(1, child2_accessible->GetIndexInParent());
+  EXPECT_EQ(2, child3_accessible->GetIndexInParent());
 
   // Process a notification containing the changed subtree rooted at
   // the container.
@@ -462,11 +462,11 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) {
   EXPECT_FALSE(child3_accessible->instance_active());
 
   // Ensure that we retain the parent of the detached subtree.
-  EXPECT_EQ(root_accessible, container_accessible->parent());
-  EXPECT_EQ(0, container_accessible->index_in_parent());
+  EXPECT_EQ(root_accessible, container_accessible->GetParent());
+  EXPECT_EQ(0, container_accessible->GetIndexInParent());
 
   // Check that the index in parent has been updated.
-  EXPECT_EQ(2, child2_accessible->index_in_parent());
+  EXPECT_EQ(2, child2_accessible->GetIndexInParent());
 
   // Release our references. The object count should only decrease by 1
   // for child3.