Remove old accessibility enums, finish renaming public interface.

Source/testing/runner/AccessibilityUIElementChromium.h

 /*
  * 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.
  */
 
 #ifndef AccessibilityUIElementChromium_h
 #define AccessibilityUIElementChromium_h
 
 #include "CppBoundClass.h"
-#include "public/web/WebAccessibilityObject.h"
+#include "public/web/WebAXObject.h"
 #include <vector>
 
 namespace WebTestRunner {
 
 class AccessibilityUIElement : public CppBoundClass {
 public:
     class Factory {
     public:
         virtual ~Factory() { }
-        virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAccessibilityObject&) = 0;
+        virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAXObject&) = 0;

[jamesr, 2013/09/03 21:52:42]

AccessibilityUIElement ... WebAXObject

The inconsistency here is not great.  Are you planning to continue the AXFoo
naming convention through this part of the code as well?

[dmazzoni, 2013/09/06 19:53:32]

Even before, AccessibilityUIElement was a confusing name.

I think something like WebAXObjectWrapper or WebAXObjectProxy would be better.

     };
 
-    AccessibilityUIElement(const WebKit::WebAccessibilityObject&, Factory*);
+    AccessibilityUIElement(const WebKit::WebAXObject&, Factory*);
 
     virtual AccessibilityUIElement* getChildAtIndex(unsigned);
     virtual bool isRoot() const { return false; }
-    virtual bool isEqual(const WebKit::WebAccessibilityObject&);
+    virtual bool isEqual(const WebKit::WebAXObject&);
 
     virtual void notificationReceived(const char *notificationName);
 
 protected:
-    const WebKit::WebAccessibilityObject& accessibilityObject() const { return m_accessibilityObject; }
+    const WebKit::WebAXObject& accessibilityObject() const { return m_accessibilityObject; }
 
     Factory* factory() const { return m_factory; }
 
 private:
     // Bound properties.
     void roleGetterCallback(CppVariant*);
     void titleGetterCallback(CppVariant*);
     void descriptionGetterCallback(CppVariant*);
     void helpTextGetterCallback(CppVariant*);
     void stringValueGetterCallback(CppVariant*);
@@ skipping 68 matching lines @@
     void isEqualCallback(const CppArgumentList&, CppVariant*);
     void addNotificationListenerCallback(const CppArgumentList&, CppVariant*);
     void removeNotificationListenerCallback(const CppArgumentList&, CppVariant*);
     void takeFocusCallback(const CppArgumentList&, CppVariant*);
     void scrollToMakeVisibleCallback(const CppArgumentList&, CppVariant*);
     void scrollToMakeVisibleWithSubFocusCallback(const CppArgumentList&, CppVariant*);
     void scrollToGlobalPointCallback(const CppArgumentList&, CppVariant*);
 
     void fallbackCallback(const CppArgumentList&, CppVariant*);
 
-    WebKit::WebAccessibilityObject m_accessibilityObject;
+    WebKit::WebAXObject m_accessibilityObject;
     Factory* m_factory;
     std::vector<CppVariant> m_notificationCallbacks;
 };
 
 
 class RootAccessibilityUIElement : public AccessibilityUIElement {
 public:
-    RootAccessibilityUIElement(const WebKit::WebAccessibilityObject&, Factory*);
+    RootAccessibilityUIElement(const WebKit::WebAXObject&, Factory*);
 
     virtual AccessibilityUIElement* getChildAtIndex(unsigned);
     virtual bool isRoot() const { return true; }
 };
 
 
 // Provides simple lifetime management of the AccessibilityUIElement instances:
 // all AccessibilityUIElements ever created from the controller are stored in
 // a list and cleared explicitly.
 class AccessibilityUIElementList : public AccessibilityUIElement::Factory {
 public:
     AccessibilityUIElementList() { }
     virtual ~AccessibilityUIElementList();
 
     void clear();
-    virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAccessibilityObject&);
-    AccessibilityUIElement* createRoot(const WebKit::WebAccessibilityObject&);
+    virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAXObject&);
+    AccessibilityUIElement* createRoot(const WebKit::WebAXObject&);
 
 private:
     typedef std::vector<AccessibilityUIElement*> ElementList;
     ElementList m_elements;
 };
 
 }
 
 #endif // AccessibilityUIElementChromium_h