Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/accessibility_tree_formatter_gtk.cc

 // Copyright 2013 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"
 
 #include <atk/atk.h>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_gtk.h"
 
 namespace content {
 
 void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
                                                base::DictionaryValue* dict) {
   BrowserAccessibilityGtk* node_gtk =
       const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityGtk();
   AtkObject* atk_object = node_gtk->GetAtkObject();
   AtkRole role = atk_object_get_role(atk_object);
   if (role != ATK_ROLE_UNKNOWN)
     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);
   WriteAttribute(true, base::StringPrintf("name='%s'", name_value.c_str()),
                  &line);
 
   std::string description_value;
   node.GetString("description", &description_value);
   WriteAttribute(false,
                  base::StringPrintf("description='%s'",
                                     description_value.c_str()),
                  &line);
 
   const base::ListValue* states_value;
   node.GetList("states", &states_value);
   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;
   node.GetInteger("id", &id_value);
   WriteAttribute(false,
                  base::StringPrintf("id=%d", id_value),
                  &line);
 
   return indent + line + base::ASCIIToUTF16("\n");
 }
@@ skipping 21 matching lines @@
 const std::string AccessibilityTreeFormatter::GetAllowString() {
   return "@GTK-ALLOW:";
 }
 
 // static
 const std::string AccessibilityTreeFormatter::GetDenyString() {
   return "@GTK-DENY:";
 }
 
 }