Remove old accessibility enums, finish renaming public interface.

Source/testing/runner/AccessibilityControllerChromium.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AccessibilityControllerChromium.h"
 
 #include "public/platform/WebCString.h"
 #include "public/testing/WebTestDelegate.h"
-#include "public/web/WebAccessibilityObject.h"
+#include "public/web/WebAXObject.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebNode.h"
 #include "public/web/WebView.h"
 
 using namespace WebKit;
 
 namespace WebTestRunner {
 
 AccessibilityController::AccessibilityController()
     : m_logAccessibilityEvents(false)
 {
 
     bindMethod("logAccessibilityEvents", &AccessibilityController::logAccessibilityEventsCallback);
     bindMethod("addNotificationListener", &AccessibilityController::addNotificationListenerCallback);
     bindMethod("removeNotificationListener", &AccessibilityController::removeNotificationListenerCallback);
 
     bindProperty("focusedElement", &AccessibilityController::focusedElementGetterCallback);
     bindProperty("rootElement", &AccessibilityController::rootElementGetterCallback);
 
     bindMethod("accessibleElementById", &AccessibilityController::accessibleElementByIdGetterCallback);
 
     bindFallbackMethod(&AccessibilityController::fallbackCallback);
 }
 
 void AccessibilityController::bindToJavascript(WebFrame* frame, const WebString& classname)
 {
-    WebAccessibilityObject::enableAccessibility();
+    WebAXObject::enableAccessibility();
     CppBoundClass::bindToJavascript(frame, classname);
 }
 
 void AccessibilityController::reset()
 {
-    m_rootElement = WebAccessibilityObject();
-    m_focusedElement = WebAccessibilityObject();
+    m_rootElement = WebAXObject();
+    m_focusedElement = WebAXObject();
     m_elements.clear();
     m_notificationCallbacks.clear();
 
     m_logAccessibilityEvents = false;
 }
 
-void AccessibilityController::setFocusedElement(const WebAccessibilityObject& focusedElement)
+void AccessibilityController::setFocusedElement(const WebAXObject& focusedElement)
 {
     m_focusedElement = focusedElement;
 }
 
 AccessibilityUIElement* AccessibilityController::getFocusedElement()
 {
     if (m_focusedElement.isNull())
         m_focusedElement = m_webView->accessibilityObject();
     return m_elements.getOrCreate(m_focusedElement);
 }
 
 AccessibilityUIElement* AccessibilityController::getRootElement()
 {
     if (m_rootElement.isNull())
         m_rootElement = m_webView->accessibilityObject();
     return m_elements.createRoot(m_rootElement);
 }
 
-AccessibilityUIElement* AccessibilityController::findAccessibleElementByIdRecursive(const WebAccessibilityObject& obj, const WebString& id)
+AccessibilityUIElement* AccessibilityController::findAccessibleElementByIdRecursive(const WebAXObject& obj, const WebString& id)
 {
     if (obj.isNull() || obj.isDetached())
         return 0;
 
     WebNode node = obj.node();
     if (!node.isNull() && node.isElementNode()) {
         WebElement element = node.to<WebElement>();
         element.getAttribute("id");
         if (element.getAttribute("id") == id)
             return m_elements.getOrCreate(obj);
@@ skipping 17 matching lines @@
         return 0;
 
     return findAccessibleElementByIdRecursive(m_rootElement, WebString::fromUTF8(id.c_str()));
 }
 
 bool AccessibilityController::shouldLogAccessibilityEvents()
 {
     return m_logAccessibilityEvents;
 }
 
-void AccessibilityController::notificationReceived(const WebKit::WebAccessibilityObject& target, const char* notificationName)
+void AccessibilityController::notificationReceived(const WebKit::WebAXObject& target, const char* notificationName)
 {
     // Call notification listeners on the element.
     AccessibilityUIElement* element = m_elements.getOrCreate(target);
     element->notificationReceived(notificationName);
 
     // Call global notification listeners.
     size_t callbackCount = m_notificationCallbacks.size();
     for (size_t i = 0; i < callbackCount; i++) {
         CppVariant arguments[2];
         arguments[0].set(*element->getAsCppVariant());
@@ skipping 51 matching lines @@
     result->set(*(foundElement->getAsCppVariant()));
 }
 
 void AccessibilityController::fallbackCallback(const CppArgumentList&, CppVariant* result)
 {
     m_delegate->printMessage("CONSOLE MESSAGE: JavaScript ERROR: unknown method called on AccessibilityController\n");
     result->setNull();
 }
 
 }