Revert of Migrate BrowserAccessibility windows unique id handling to AXPlatformNodeWin.

content/browser/accessibility/web_contents_accessibility_android.cc

 // Copyright 2017 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/web_contents_accessibility_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
@@ skipping 546 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   InitSearchKeyToPredicateMapIfNeeded();
   return base::android::ConvertUTF16ToJavaString(env, g_all_search_keys.Get());
 }
 
 jint WebContentsAccessibilityAndroid::GetRootId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   if (root_manager_) {
-    auto* root =
-        static_cast<BrowserAccessibilityAndroid*>(root_manager_->GetRoot());
+    auto* root = root_manager_->GetRoot();
     if (root)
       return static_cast<jint>(root->unique_id());
   }
   return -1;
 }
 
 jboolean WebContentsAccessibilityAndroid::IsNodeValid(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint unique_id) {
@@ skipping 55 matching lines @@
 jboolean WebContentsAccessibilityAndroid::PopulateAccessibilityNodeInfo(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& info,
     jint unique_id) {
   BrowserAccessibilityAndroid* node = GetAXFromUniqueID(unique_id);
   if (!node)
     return false;
 
   if (node->PlatformGetParent()) {
-    auto* android_node =
-        static_cast<BrowserAccessibilityAndroid*>(node->PlatformGetParent());
     Java_WebContentsAccessibility_setAccessibilityNodeInfoParent(
-        env, obj, info, android_node->unique_id());
+        env, obj, info, node->PlatformGetParent()->unique_id());
   }
   for (unsigned i = 0; i < node->PlatformChildCount(); ++i) {
-    auto* android_node =
-        static_cast<BrowserAccessibilityAndroid*>(node->PlatformGetChild(i));
     Java_WebContentsAccessibility_addAccessibilityNodeInfoChild(
-        env, obj, info, android_node->unique_id());
+        env, obj, info, node->PlatformGetChild(i)->unique_id());
   }
   Java_WebContentsAccessibility_setAccessibilityNodeInfoBooleanAttributes(
       env, obj, info, unique_id, node->IsCheckable(), node->IsChecked(),
       node->IsClickable(), node->IsEnabled(), node->IsFocusable(),
       node->IsFocused(), node->IsPassword(), node->IsScrollable(),
       node->IsSelected(), node->IsVisibleToUser());
   Java_WebContentsAccessibility_addAccessibilityNodeInfoActions(
       env, obj, info, unique_id, node->CanScrollForward(),
       node->CanScrollBackward(), node->CanScrollUp(), node->CanScrollDown(),
       node->CanScrollLeft(), node->CanScrollRight(), node->IsClickable(),
@@ skipping 259 matching lines @@
                                ? OneShotAccessibilityTreeSearch::FORWARDS
                                : OneShotAccessibilityTreeSearch::BACKWARDS);
   tree_search.SetResultLimit(1);
   tree_search.SetImmediateDescendantsOnly(false);
   tree_search.SetVisibleOnly(false);
   tree_search.AddPredicate(predicate);
 
   if (tree_search.CountMatches() == 0)
     return 0;
 
-  auto* android_node =
-      static_cast<BrowserAccessibilityAndroid*>(tree_search.GetMatchAtIndex(0));
-  int32_t element_id = android_node->unique_id();
+  int32_t element_id = tree_search.GetMatchAtIndex(0)->unique_id();
 
   // Navigate forwards to the autofill popup's proxy node if focus is currently
   // on the element hosting the autofill popup. Once within the popup, a back
   // press will navigate back to the element hosting the popup. If user swipes
   // past last suggestion in the popup, or swipes left from the first suggestion
   // in the popup, we will navigate to the element that is the next element in
   // the document after the element hosting the popup.
   if (forwards && start_id == g_element_hosting_autofill_popup_unique_id &&
       g_autofill_popup_proxy_node) {
     g_element_after_element_hosting_autofill_popup_unique_id = element_id;
-    auto* android_node =
-        static_cast<BrowserAccessibilityAndroid*>(g_autofill_popup_proxy_node);
-    return android_node->unique_id();
+    return g_autofill_popup_proxy_node->unique_id();
   }
 
   return element_id;
 }
 
 jboolean WebContentsAccessibilityAndroid::NextAtGranularity(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint granularity,
     jboolean extend_selection,
@@ skipping 82 matching lines @@
   ax_node_data.role = ui::AX_ROLE_MENU;
   ax_node_data.SetName("Autofill");
   ax_node_data.AddIntAttribute(ui::AX_ATTR_RESTRICTION,
                                ui::AX_RESTRICTION_READ_ONLY);
   ax_node_data.AddState(ui::AX_STATE_FOCUSABLE);
   ax_node_data.AddState(ui::AX_STATE_SELECTABLE);
   g_autofill_popup_proxy_node_ax_node->SetData(ax_node_data);
   g_autofill_popup_proxy_node->Init(root_manager_,
                                     g_autofill_popup_proxy_node_ax_node);
 
-  auto* android_node = static_cast<BrowserAccessibilityAndroid*>(current_focus);
-
-  g_element_hosting_autofill_popup_unique_id = android_node->unique_id();
+  g_element_hosting_autofill_popup_unique_id = current_focus->unique_id();
 }
 
 void WebContentsAccessibilityAndroid::OnAutofillPopupDismissed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   g_element_hosting_autofill_popup_unique_id = -1;
   g_element_after_element_hosting_autofill_popup_unique_id = -1;
   DeleteAutofillPopupProxy();
 }
 
 jint WebContentsAccessibilityAndroid::
     GetIdForElementAfterElementHostingAutofillPopup(
         JNIEnv* env,
         const JavaParamRef<jobject>& obj) {
   if (!base::FeatureList::IsEnabled(features::kAndroidAutofillAccessibility) ||
       g_element_after_element_hosting_autofill_popup_unique_id == -1 ||
       GetAXFromUniqueID(
           g_element_after_element_hosting_autofill_popup_unique_id) == nullptr)
     return 0;
 
   return g_element_after_element_hosting_autofill_popup_unique_id;
 }
 
 jboolean WebContentsAccessibilityAndroid::IsAutofillPopupNode(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint unique_id) {
-  auto* android_node =
-      static_cast<BrowserAccessibilityAndroid*>(g_autofill_popup_proxy_node);
-
-  return g_autofill_popup_proxy_node && android_node->unique_id() == unique_id;
+  return g_autofill_popup_proxy_node &&
+         g_autofill_popup_proxy_node->unique_id() == unique_id;
 }
 
 bool WebContentsAccessibilityAndroid::Scroll(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj,
                                              jint unique_id,
                                              int direction) {
   BrowserAccessibilityAndroid* node = GetAXFromUniqueID(unique_id);
   if (!node)
     return false;
 
   return node->Scroll(direction);
 }
 
 BrowserAccessibilityAndroid* WebContentsAccessibilityAndroid::GetAXFromUniqueID(
     int32_t unique_id) {
   return static_cast<BrowserAccessibilityAndroid*>(
-      BrowserAccessibilityAndroid::GetFromUniqueId(unique_id));
+      BrowserAccessibility::GetFromUniqueID(unique_id));
 }
 
 void WebContentsAccessibilityAndroid::UpdateFrameInfo() {
   if (frame_info_initialized_)
     return;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
@@ skipping 79 matching lines @@
            const JavaParamRef<jobject>& jweb_contents,
            jboolean should_focus_on_page_load) {
   WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
 
   return reinterpret_cast<intptr_t>(new WebContentsAccessibilityAndroid(
       env, obj, web_contents, should_focus_on_page_load));
 }
 
 }  // namespace content