Use unique IDs for accessibility nodes on Android

content/browser/accessibility/accessibility_tree_formatter_mac.mm

 // 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 "content/browser/accessibility/accessibility_tree_formatter.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
@@ skipping 24 matching lines @@
 const char* kRangeLenDictAttr = "len";
 
 scoped_ptr<base::DictionaryValue> PopulatePosition(
     const BrowserAccessibility& node) {
   scoped_ptr<base::DictionaryValue> position(new base::DictionaryValue);
   // The NSAccessibility position of an object is in global coordinates and
   // based on the lower-left corner of the object. To make this easier and less
   // confusing, convert it to local window coordinates using the top-left
   // corner when dumping the position.
   BrowserAccessibility* root = node.manager()->GetRootManager()->GetRoot();
-  BrowserAccessibilityCocoa* cocoa_root = root->ToBrowserAccessibilityCocoa();
+  BrowserAccessibilityCocoa* cocoa_root = ToBrowserAccessibilityCocoa(root);
   NSPoint root_position = [[cocoa_root position] pointValue];
   NSSize root_size = [[cocoa_root size] sizeValue];
   int root_top = -static_cast<int>(root_position.y + root_size.height);
   int root_left = static_cast<int>(root_position.x);
 
   BrowserAccessibilityCocoa* cocoa_node =
-      const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityCocoa();
+      ToBrowserAccessibilityCocoa(const_cast<BrowserAccessibility*>(&node));
   NSPoint node_position = [[cocoa_node position] pointValue];
   NSSize node_size = [[cocoa_node size] sizeValue];
 
   position->SetInteger(kXCoordDictAttr,
                        static_cast<int>(node_position.x - root_left));
   position->SetInteger(kYCoordDictAttr,
       static_cast<int>(-node_position.y - node_size.height - root_top));
   return position;
 }
 
@@ skipping 151 matching lines @@
 }
 
 AccessibilityTreeFormatterMac::~AccessibilityTreeFormatterMac() {
 }
 
 void AccessibilityTreeFormatterMac::AddProperties(
     const BrowserAccessibility& node,
     base::DictionaryValue* dict) {
   dict->SetInteger("id", node.GetId());
   BrowserAccessibilityCocoa* cocoa_node =
-      const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityCocoa();
+      ToBrowserAccessibilityCocoa(const_cast<BrowserAccessibility*>(&node));
   NSArray* supportedAttributes = [cocoa_node accessibilityAttributeNames];
 
   string role = SysNSStringToUTF8(
       [cocoa_node accessibilityAttributeValue:NSAccessibilityRoleAttribute]);
   dict->SetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), role);
 
   NSString* subrole =
       [cocoa_node accessibilityAttributeValue:NSAccessibilitySubroleAttribute];
   if (subrole != nil) {
     dict->SetString(SysNSStringToUTF8(NSAccessibilitySubroleAttribute),
@@ skipping 95 matching lines @@
 
 const string AccessibilityTreeFormatterMac::GetAllowString() {
   return "@MAC-ALLOW:";
 }
 
 const string AccessibilityTreeFormatterMac::GetDenyString() {
   return "@MAC-DENY:";
 }
 
 }  // namespace content