Initial support for native accessibility in ARC

content/browser/accessibility/browser_accessibility_manager.cc

Index: content/browser/accessibility/browser_accessibility_manager.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index ad4e430ae24986c88c711555a394cc8c664da0e8..971e831c6d2c781ec7de017b0d0c7c024e4f3f54 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -5,6 +5,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 
 #include <stddef.h>
+#include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ -39,8 +40,8 @@ BrowserAccessibility* FindNodeWithChildTreeId(BrowserAccessibility* node,
 }  // namespace
 
 // Map from AXTreeID to BrowserAccessibilityManager
-using AXTreeIDMap =
-    base::hash_map<AXTreeIDRegistry::AXTreeID, BrowserAccessibilityManager*>;
+using AXTreeIDMap = base::hash_map<ui::AXTreeIDRegistry::AXTreeID,
+                                   BrowserAccessibilityManager*>;
 base::LazyInstance<AXTreeIDMap> g_ax_tree_id_map = LAZY_INSTANCE_INITIALIZER;
 
 // A function to call when focus changes, for testing only.
@@ -116,7 +117,7 @@ BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::FromID(
-    AXTreeIDRegistry::AXTreeID ax_tree_id) {
+    ui::AXTreeIDRegistry::AXTreeID ax_tree_id) {
   AXTreeIDMap* ax_tree_id_map = g_ax_tree_id_map.Pointer();
   auto iter = ax_tree_id_map->find(ax_tree_id);
   return iter == ax_tree_id_map->end() ? nullptr : iter->second;
@@ -133,7 +134,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
       last_focused_node_(nullptr),
       last_focused_manager_(nullptr),
       connected_to_parent_tree_node_(false),
-      ax_tree_id_(AXTreeIDRegistry::kNoAXTreeID),
+      ax_tree_id_(ui::AXTreeIDRegistry::kNoAXTreeID),
       parent_node_id_from_parent_tree_(0) {
   tree_->SetDelegate(this);
 }
@@ -149,7 +150,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
       osk_state_(OSK_ALLOWED),
       last_focused_node_(nullptr),
       last_focused_manager_(nullptr),
-      ax_tree_id_(AXTreeIDRegistry::kNoAXTreeID),
+      ax_tree_id_(ui::AXTreeIDRegistry::kNoAXTreeID),
       parent_node_id_from_parent_tree_(0) {
   tree_->SetDelegate(this);
   Initialize(initial_tree);