Migrate BrowserAccessibility windows unique id handling to AXPlatformNodeWin.

content/browser/accessibility/browser_accessibility.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 24 matching lines @@
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
   return new BrowserAccessibility();
 }
 #endif
 
 BrowserAccessibility::BrowserAccessibility()
     : manager_(nullptr),
       node_(nullptr),
       unique_id_(ui::GetNextAXPlatformNodeUniqueId()) {
-  g_unique_id_map.Get()[unique_id_] = this;
+  g_unique_id_map.Get()[unique_id()] = this;
 }
 
 BrowserAccessibility::~BrowserAccessibility() {
-  if (unique_id_)
-    g_unique_id_map.Get().erase(unique_id_);
+  if (unique_id())
+    g_unique_id_map.Get().erase(unique_id());
 }
 
 // static
-BrowserAccessibility* BrowserAccessibility::GetFromUniqueID(int32_t unique_id) {
+BrowserAccessibility* BrowserAccessibility::GetFromUniqueId(int32_t unique_id) {
   auto iter = g_unique_id_map.Get().find(unique_id);
   if (iter == g_unique_id_map.Get().end())
     return nullptr;
 
   return iter->second;
 }
 
 void BrowserAccessibility::Init(BrowserAccessibilityManager* manager,
     ui::AXNode* node) {
   manager_ = manager;
@@ skipping 501 matching lines @@
 
 void BrowserAccessibility::Destroy() {
   // Allow the object to fire a TextRemoved notification.
   manager()->NotifyAccessibilityEvent(
       BrowserAccessibilityEvent::FromTreeChange,
       ui::AX_EVENT_HIDE,
       this);
   node_ = NULL;
   manager_ = NULL;
 
-  if (unique_id_)
-    g_unique_id_map.Get().erase(unique_id_);
-  unique_id_ = 0;
+  if (unique_id())
+    g_unique_id_map.Get().erase(unique_id());
 
   NativeReleaseReference();
 }
 
 void BrowserAccessibility::NativeReleaseReference() {
   delete this;
 }
 
+int32_t BrowserAccessibility::unique_id() const {
+  return unique_id_;
+}
+
 bool BrowserAccessibility::HasBoolAttribute(
     ui::AXBoolAttribute attribute) const {
   return GetData().HasBoolAttribute(attribute);
 }
 
 bool BrowserAccessibility::GetBoolAttribute(
     ui::AXBoolAttribute attribute) const {
   return GetData().GetBoolAttribute(attribute);
 }
 
@@ skipping 423 matching lines @@
   return false;
 }
 
 bool BrowserAccessibility::ShouldIgnoreHoveredStateForTesting() {
   BrowserAccessibilityStateImpl* accessibility_state =
       BrowserAccessibilityStateImpl::GetInstance();
   return accessibility_state->disable_hot_tracking_for_testing();
 }
 
 }  // namespace content