Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_manager.cc

Index: content/browser/accessibility/browser_accessibility_manager.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index a71ed6e4c82ee68898ca2c487aa3486e82acc75e..657204665458e26176eb1f53a88b71583790b605 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -116,7 +116,7 @@ bool BrowserAccessibilityManager::UseRootScrollOffsetsWhenComputingBounds() {
 void BrowserAccessibilityManager::RemoveNode(BrowserAccessibility* node) {
   if (node == focus_)
     SetFocus(root_, false);
-  int renderer_id = node->renderer_id();
+  int renderer_id = node->GetId();
   renderer_id_map_.erase(renderer_id);
 }
 
@@ -198,7 +198,7 @@ void BrowserAccessibilityManager::SetFocus(
     focus_ = node;
 
   if (notify && node && delegate_)
-    delegate_->SetAccessibilityFocus(node->renderer_id());
+    delegate_->SetAccessibilityFocus(node->GetId());
 }
 
 void BrowserAccessibilityManager::SetRoot(BrowserAccessibility* node) {
@@ -209,20 +209,20 @@ void BrowserAccessibilityManager::SetRoot(BrowserAccessibility* node) {
 void BrowserAccessibilityManager::DoDefaultAction(
     const BrowserAccessibility& node) {
   if (delegate_)
-    delegate_->AccessibilityDoDefaultAction(node.renderer_id());
+    delegate_->AccessibilityDoDefaultAction(node.GetId());
 }
 
 void BrowserAccessibilityManager::ScrollToMakeVisible(
     const BrowserAccessibility& node, gfx::Rect subfocus) {
   if (delegate_) {
-    delegate_->AccessibilityScrollToMakeVisible(node.renderer_id(), subfocus);
+    delegate_->AccessibilityScrollToMakeVisible(node.GetId(), subfocus);
   }
 }
 
 void BrowserAccessibilityManager::ScrollToPoint(
     const BrowserAccessibility& node, gfx::Point point) {
   if (delegate_) {
-    delegate_->AccessibilityScrollToPoint(node.renderer_id(), point);
+    delegate_->AccessibilityScrollToPoint(node.GetId(), point);
   }
 }
 
@@ -230,7 +230,7 @@ void BrowserAccessibilityManager::SetTextSelection(
     const BrowserAccessibility& node, int start_offset, int end_offset) {
   if (delegate_) {
     delegate_->AccessibilitySetTextSelection(
-        node.renderer_id(), start_offset, end_offset);
+        node.GetId(), start_offset, end_offset);
   }
 }
 
@@ -248,12 +248,12 @@ BrowserAccessibility* BrowserAccessibilityManager::NextInTreeOrder(
   if (node->PlatformChildCount() > 0)
     return node->PlatformGetChild(0);
   while (node) {
-    if (node->parent() &&
-        node->index_in_parent() <
-            static_cast<int>(node->parent()->PlatformChildCount()) - 1) {
-      return node->parent()->PlatformGetChild(node->index_in_parent() + 1);
+    if (node->GetParent() &&
+        node->GetIndexInParent() <
+            static_cast<int>(node->GetParent()->PlatformChildCount()) - 1) {
+      return node->GetParent()->PlatformGetChild(node->GetIndexInParent() + 1);
     }
-    node = node->parent();
+    node = node->GetParent();
   }
 
   return NULL;
@@ -264,14 +264,14 @@ BrowserAccessibility* BrowserAccessibilityManager::PreviousInTreeOrder(
   if (!node)
     return NULL;
 
-  if (node->parent() && node->index_in_parent() > 0) {
-    node = node->parent()->PlatformGetChild(node->index_in_parent() - 1);
+  if (node->GetParent() && node->GetIndexInParent() > 0) {
+    node = node->GetParent()->PlatformGetChild(node->GetIndexInParent() - 1);
     while (node->PlatformChildCount() > 0)
       node = node->PlatformGetChild(node->PlatformChildCount() - 1);
     return node;
   }
 
-  return node->parent();
+  return node->GetParent();
 }
 
 void BrowserAccessibilityManager::UpdateNodesForTesting(
@@ -363,7 +363,7 @@ BrowserAccessibility* BrowserAccessibilityManager::CreateNode(
 }
 
 void BrowserAccessibilityManager::AddNodeToMap(BrowserAccessibility* node) {
-  renderer_id_map_[node->renderer_id()] = node;
+  renderer_id_map_[node->GetId()] = node;
 }
 
 bool BrowserAccessibilityManager::UpdateNode(const ui::AXNodeData& src) {
@@ -408,9 +408,10 @@ bool BrowserAccessibilityManager::UpdateNode(const ui::AXNodeData& src) {
   // parent and new parent, which could lead to a double-free.
   // If a node is reparented, the renderer will always send us a fresh
   // copy of the node.
-  const std::vector<BrowserAccessibility*>& old_children = instance->children();
+  const std::vector<BrowserAccessibility*>& old_children =
+      instance->deprecated_children();
   for (size_t i = 0; i < old_children.size(); ++i) {
-    int old_id = old_children[i]->renderer_id();
+    int old_id = old_children[i]->GetId();
     if (new_child_ids.find(old_id) == new_child_ids.end())
       old_children[i]->Destroy();
   }
@@ -424,7 +425,7 @@ bool BrowserAccessibilityManager::UpdateNode(const ui::AXNodeData& src) {
     int32 index_in_parent = static_cast<int32>(i);
     BrowserAccessibility* child = GetFromRendererID(child_renderer_id);
     if (child) {
-      if (child->parent() != instance) {
+      if (child->GetParent() != instance) {
         // This is a serious error - nodes should never be reparented.
         // If this case occurs, continue so this node isn't left in an
         // inconsistent state, but return failure at the end.
@@ -443,7 +444,7 @@ bool BrowserAccessibilityManager::UpdateNode(const ui::AXNodeData& src) {
 
   // Handle the case where this node is the new root of the tree.
   if (src.role == ui::AX_ROLE_ROOT_WEB_AREA &&
-      (!root_ || root_->renderer_id() != src.id)) {
+      (!root_ || root_->GetId() != src.id)) {
     if (root_)
       root_->Destroy();
     if (focus_ == root_)