1 files changed, 15 insertions, 14 deletions

diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index 50319e11c..644a0a9f0 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -39,7 +39,7 @@
 
 #include "browser_accessibility_manager_qt.h"
 
-#include "third_party/WebKit/public/web/WebAXEnums.h"
+#include "ui/accessibility/ax_enums.mojom.h"
 #include "browser_accessibility_qt.h"
 
 using namespace blink;
@@ -52,18 +52,19 @@ BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
       BrowserAccessibilityFactory* factory)
 {
 #ifndef QT_NO_ACCESSIBILITY
-        return new BrowserAccessibilityManagerQt(0, initialTree, delegate);
+    return new BrowserAccessibilityManagerQt(nullptr, initialTree, delegate, factory);
 #else
-        return 0;
+    delete factory;
+    return nullptr;
 #endif // QT_NO_ACCESSIBILITY
 }
 
-BrowserAccessibility *BrowserAccessibilityFactoryQt::Create()
+BrowserAccessibility *BrowserAccessibility::Create()
 {
 #ifndef QT_NO_ACCESSIBILITY
     return new BrowserAccessibilityQt();
 #else
-    return 0;
+    return nullptr;
 #endif // QT_NO_ACCESSIBILITY
 }
 
@@ -82,25 +83,25 @@ QAccessibleInterface *BrowserAccessibilityManagerQt::rootParentAccessible()
     return QAccessible::queryAccessibleInterface(m_parentObject);
 }
 
-void BrowserAccessibilityManagerQt::FireBlinkEvent(ui::AXEvent event_type,
+void BrowserAccessibilityManagerQt::FireBlinkEvent(ax::mojom::Event event_type,
                                                    BrowserAccessibility* node)
 {
     BrowserAccessibilityQt *iface = static_cast<BrowserAccessibilityQt*>(node);
 
     switch (event_type) {
-    case ui::AX_EVENT_FOCUS: {
+    case ax::mojom::Event::kFocus: {
         QAccessibleEvent event(iface, QAccessible::Focus);
         QAccessible::updateAccessibility(&event);
         break;
     }
-    case ui::AX_EVENT_CHECKED_STATE_CHANGED: {
+    case ax::mojom::Event::kCheckedStateChanged: {
         QAccessible::State change;
         change.checked = true;
         QAccessibleStateChangeEvent event(iface, change);
         QAccessible::updateAccessibility(&event);
         break;
     }
-    case ui::AX_EVENT_VALUE_CHANGED: {
+    case ax::mojom::Event::kValueChanged: {
         QVariant value;
         if (QAccessibleValueInterface *valueIface = iface->valueInterface())
             value = valueIface->currentValue();
@@ -108,18 +109,18 @@ void BrowserAccessibilityManagerQt::FireBlinkEvent(ui::AXEvent event_type,
         QAccessible::updateAccessibility(&event);
         break;
     }
-    case ui::AX_EVENT_CHILDREN_CHANGED:
+    case ax::mojom::Event::kChildrenChanged:
         break;
-    case ui::AX_EVENT_LAYOUT_COMPLETE:
+    case ax::mojom::Event::kLayoutComplete:
         break;
-    case ui::AX_EVENT_LOAD_COMPLETE:
+    case ax::mojom::Event::kLoadComplete:
         break;
-    case ui::AX_EVENT_TEXT_CHANGED: {
+    case ax::mojom::Event::kTextChanged: {
         QAccessibleTextUpdateEvent event(iface, -1, QString(), QString());
         QAccessible::updateAccessibility(&event);
         break;
     }
-    case ui::AX_EVENT_TEXT_SELECTION_CHANGED: {
+    case ax::mojom::Event::kTextSelectionChanged: {
         QAccessibleTextInterface *textIface = iface->textInterface();
         if (textIface) {
             int start = 0;