Refactor all accessibility code out of webkit/glue.

content/browser/accessibility/browser_accessibility_gtk.cc

Index: content/browser/accessibility/browser_accessibility_gtk.cc
diff --git a/content/browser/accessibility/browser_accessibility_gtk.cc b/content/browser/accessibility/browser_accessibility_gtk.cc
index 5f2a490a4b3cb5145e4bb9d707d222e9b1681bcf..a42622559c9894dc9e7ded221961787d9d884aa9 100644
--- a/content/browser/accessibility/browser_accessibility_gtk.cc
+++ b/content/browser/accessibility/browser_accessibility_gtk.cc
@@ -10,7 +10,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
 #include "content/common/accessibility_messages.h"
 
-using webkit_glue::WebAccessibility;
+using content::AccessibilityNodeData;
 
 // The maximum length of an autogenerated unique type name string,
 // generated from the 16-bit interface mask from an AtkObject.
@@ -90,7 +90,7 @@ static AtkStateSet* browser_accessibility_ref_state_set(AtkObject* atk_object) {
           ref_state_set(atk_object);
   int32 state = obj->state();
 
-  if ((state >> WebAccessibility::STATE_FOCUSABLE) & 1)
+  if ((state >> AccessibilityNodeData::STATE_FOCUSABLE) & 1)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
   if (obj->manager()->GetFocus(NULL) == obj)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
@@ -314,32 +314,32 @@ void BrowserAccessibilityGtk::InitRoleAndState() {
   atk_acc_name_ = UTF16ToUTF8(name());
 
   string16 description;
-  GetStringAttribute(WebAccessibility::ATTR_DESCRIPTION, &description);
+  GetStringAttribute(AccessibilityNodeData::ATTR_DESCRIPTION, &description);
   atk_acc_description_ = UTF16ToUTF8(description);
 
   switch(role_) {
-    case WebAccessibility::ROLE_BUTTON:
+    case AccessibilityNodeData::ROLE_BUTTON:
       atk_role_ = ATK_ROLE_PUSH_BUTTON;
       break;
-    case WebAccessibility::ROLE_CHECKBOX:
+    case AccessibilityNodeData::ROLE_CHECKBOX:
       atk_role_ = ATK_ROLE_CHECK_BOX;
       break;
-    case WebAccessibility::ROLE_COMBO_BOX:
+    case AccessibilityNodeData::ROLE_COMBO_BOX:
       atk_role_ = ATK_ROLE_COMBO_BOX;
       break;
-    case WebAccessibility::ROLE_LINK:
+    case AccessibilityNodeData::ROLE_LINK:
       atk_role_ = ATK_ROLE_LINK;
       break;
-    case WebAccessibility::ROLE_RADIO_BUTTON:
+    case AccessibilityNodeData::ROLE_RADIO_BUTTON:
       atk_role_ = ATK_ROLE_RADIO_BUTTON;
       break;
-    case WebAccessibility::ROLE_TEXTAREA:
+    case AccessibilityNodeData::ROLE_TEXTAREA:
       atk_role_ = ATK_ROLE_ENTRY;
       break;
-    case WebAccessibility::ROLE_TEXT_FIELD:
+    case AccessibilityNodeData::ROLE_TEXT_FIELD:
       atk_role_ = ATK_ROLE_ENTRY;
       break;
-    case WebAccessibility::ROLE_WEBCORE_LINK:
+    case AccessibilityNodeData::ROLE_WEBCORE_LINK:
       atk_role_ = ATK_ROLE_LINK;
       break;
     default: