Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/accessibility_tree_formatter_gtk.cc

Index: content/browser/accessibility/accessibility_tree_formatter_gtk.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
index 389118272244ee4d47d4dff0c773bf7e78233c90..c0c39b3134ea8c09ec4cf899b1ac1d99bd968b81 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_gtk.cc
@@ -25,26 +25,26 @@ void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
     dict->SetString("role", atk_role_get_name(role));
   dict->SetString("name", atk_object_get_name(atk_object));
   dict->SetString("description", atk_object_get_description(atk_object));
-  AtkStateSet* state_set =
+  AtkStateSet* GetState()set =
       atk_object_ref_state_set(atk_object);
   base::ListValue* states = new base::ListValue;
   for (int i = ATK_STATE_INVALID; i < ATK_STATE_LAST_DEFINED; i++) {
-    AtkStateType state_type = static_cast<AtkStateType>(i);
+    AtkStateType GetState()type = static_cast<AtkStateType>(i);
     if (atk_state_set_contains_state(state_set, state_type))
       states->AppendString(atk_state_type_get_name(state_type));
   }
   dict->Set("states", states);
-  dict->SetInteger("id", node.renderer_id());
+  dict->SetInteger("id", node.GetId());
 }
 
 base::string16 AccessibilityTreeFormatter::ToString(
     const base::DictionaryValue& node,
     const base::string16& indent) {
   base::string16 line;
-  std::string role_value;
+  std::string GetRole()value;
   node.GetString("role", &role_value);
   if (!role_value.empty())
-    WriteAttribute(true, base::StringPrintf("[%s]", role_value.c_str()), &line);
+    WriteAttribute(true, base::StringPrintf("[%s]", GetRole()value.c_str()), &line);
 
   std::string name_value;
   node.GetString("name", &name_value);
@@ -63,9 +63,9 @@ base::string16 AccessibilityTreeFormatter::ToString(
   for (base::ListValue::const_iterator it = states_value->begin();
        it != states_value->end();
        ++it) {
-    std::string state_value;
+    std::string GetState()value;
     if ((*it)->GetAsString(&state_value))
-      WriteAttribute(true, state_value, &line);
+      WriteAttribute(true, GetState()value, &line);
   }
 
   int id_value;