Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_cocoa.mm

Index: content/browser/accessibility/browser_accessibility_cocoa.mm
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index f1565eba01336ab3769b34b25adb68ab9650aab7..1d60260596aff2da581cc457bf4afe9dccd3abfe 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -49,7 +49,7 @@ typedef std::map<ui::AXRole, NSString*> RoleMap;
 // GetState checks the bitmask used in AXNodeData to check
 // if the given state was set on the accessibility object.
 bool GetState(BrowserAccessibility* accessibility, ui::AXState state) {
-  return ((accessibility->state() >> state) & 1);
+  return ((accessibility->GetState() >> state) & 1);
 }
 
 RoleMap BuildRoleMap() {
@@ -390,7 +390,7 @@ NSDictionary* attributeToMethodNameMap = nil;
   if (![self isIgnored]) {
     children_.reset();
   } else {
-    [browserAccessibility_->parent()->ToBrowserAccessibilityCocoa()
+    [browserAccessibility_->GetParent()->ToBrowserAccessibilityCocoa()
        childrenChanged];
   }
 }
@@ -409,7 +409,7 @@ NSDictionary* attributeToMethodNameMap = nil;
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromRendererID(id);
-    if (cell && cell->role() == ui::AX_ROLE_COLUMN_HEADER)
+    if (cell && cell->GetRole() == ui::AX_ROLE_COLUMN_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
@@ -650,9 +650,9 @@ NSDictionary* attributeToMethodNameMap = nil;
 
 - (id)parent {
   // A nil parent means we're the root.
-  if (browserAccessibility_->parent()) {
+  if (browserAccessibility_->GetParent()) {
     return NSAccessibilityUnignoredAncestor(
-        browserAccessibility_->parent()->ToBrowserAccessibilityCocoa());
+        browserAccessibility_->GetParent()->ToBrowserAccessibilityCocoa());
   } else {
     // Hook back up to RenderWidgetHostViewCocoa.
     BrowserAccessibilityManagerMac* manager =
@@ -677,7 +677,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 
 // Returns an enum indicating the role from browserAccessibility_.
 - (ui::AXRole)internalRole {
-  return static_cast<ui::AXRole>(browserAccessibility_->role());
+  return static_cast<ui::AXRole>(browserAccessibility_->GetRole());
 }
 
 // Returns a string indicating the NSAccessibility role of this object.
@@ -770,7 +770,7 @@ NSDictionary* attributeToMethodNameMap = nil;
     int id = uniqueCellIds[i];
     BrowserAccessibility* cell =
         browserAccessibility_->manager()->GetFromRendererID(id);
-    if (cell && cell->role() == ui::AX_ROLE_ROW_HEADER)
+    if (cell && cell->GetRole() == ui::AX_ROLE_ROW_HEADER)
       [ret addObject:cell->ToBrowserAccessibilityCocoa()];
   }
   return ret;
@@ -1114,7 +1114,7 @@ NSDictionary* attributeToMethodNameMap = nil;
          i < browserAccessibility_->PlatformChildCount();
          ++i) {
       BrowserAccessibility* child = browserAccessibility_->PlatformGetChild(i);
-      if (child->role() != ui::AX_ROLE_ROW)
+      if (child->GetRole() != ui::AX_ROLE_ROW)
         continue;
       int rowIndex;
       if (!child->GetIntAttribute(
@@ -1129,7 +1129,7 @@ NSDictionary* attributeToMethodNameMap = nil;
            j < child->PlatformChildCount();
            ++j) {
         BrowserAccessibility* cell = child->PlatformGetChild(j);
-        if (cell->role() != ui::AX_ROLE_CELL)
+        if (cell->GetRole() != ui::AX_ROLE_CELL)
           continue;
         int colIndex;
         if (!cell->GetIntAttribute(
@@ -1353,9 +1353,9 @@ NSDictionary* attributeToMethodNameMap = nil;
         NSAccessibilityDisclosedRowsAttribute,
         nil]];
   } else if ([role isEqualToString:NSAccessibilityRowRole]) {
-    if (browserAccessibility_->parent()) {
+    if (browserAccessibility_->GetParent()) {
       base::string16 parentRole;
-      browserAccessibility_->parent()->GetHtmlAttribute(
+      browserAccessibility_->GetParent()->GetHtmlAttribute(
           "role", &parentRole);
       const base::string16 treegridRole(base::ASCIIToUTF16("treegrid"));
       if (parentRole == treegridRole) {
@@ -1456,7 +1456,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 
   // TODO(feldstein): Support more actions.
   if ([action isEqualToString:NSAccessibilityPressAction])
-    [delegate_ doDefaultAction:browserAccessibility_->renderer_id()];
+    [delegate_ doDefaultAction:browserAccessibility_->GetId()];
   else if ([action isEqualToString:NSAccessibilityShowMenuAction])
     [delegate_ performShowMenuAction:self];
 }
@@ -1485,12 +1485,12 @@ NSDictionary* attributeToMethodNameMap = nil;
     NSNumber* focusedNumber = value;
     BOOL focused = [focusedNumber intValue];
     [delegate_ setAccessibilityFocus:focused
-                     accessibilityId:browserAccessibility_->renderer_id()];
+                     accessibilityId:browserAccessibility_->GetId()];
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
     NSRange range = [(NSValue*)value rangeValue];
     [delegate_
-        accessibilitySetTextSelection:browserAccessibility_->renderer_id()
+        accessibilitySetTextSelection:browserAccessibility_->GetId()
         startOffset:range.location
         endOffset:range.location + range.length];
   }
@@ -1535,7 +1535,7 @@ NSDictionary* attributeToMethodNameMap = nil;
   // Potentially called during dealloc.
   if (!browserAccessibility_)
     return [super hash];
-  return browserAccessibility_->renderer_id();
+  return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {