Native Android accessibility.

content/browser/accessibility/accessibility_tree_formatter_android.cc

Index: content/browser/accessibility/accessibility_tree_formatter_android.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc
index a5d6a33aa22c8e0a8b98131a93d0b7e4909ad037..94fcca272a9f2741f6466b9a20044faa9455bc22 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_android.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc
@@ -52,54 +52,36 @@ void AccessibilityTreeFormatter::AddProperties(
     const BrowserAccessibility& node, DictionaryValue* dict) {
   const BrowserAccessibilityAndroid* android_node =
       static_cast<const BrowserAccessibilityAndroid*>(&node);
-  JNIEnv* env = base::android::AttachCurrentThread();
 
   // Class name.
-  dict->SetString("class", base::android::ConvertJavaStringToUTF8(
-      android_node->GetClassNameJNI(env, NULL)));
+  dict->SetString("class", android_node->GetClassName());
 
   // Bool attributes.
-  dict->SetBoolean("focusable",
-                   android_node->IsFocusableJNI(env, NULL));
-  dict->SetBoolean("focused",
-                   android_node->IsFocusedJNI(env, NULL));
-  dict->SetBoolean("clickable",
-                   android_node->GetClickableJNI(env, NULL));
-  dict->SetBoolean("editable_text",
-                   android_node->IsEditableTextJNI(env, NULL));
-  dict->SetBoolean("checkable",
-                   android_node->IsCheckableJNI(env, NULL));
-  dict->SetBoolean("checked",
-                   android_node->IsCheckedJNI(env, NULL));
-  dict->SetBoolean("disabled",
-                   !android_node->IsEnabledJNI(env, NULL));
-  dict->SetBoolean("scrollable",
-                   android_node->IsScrollableJNI(env, NULL));
-  dict->SetBoolean("password",
-                   android_node->IsPasswordJNI(env, NULL));
-  dict->SetBoolean("selected",
-                   android_node->IsSelectedJNI(env, NULL));
-  dict->SetBoolean("invisible",
-                   !android_node->IsVisibleJNI(env, NULL));
+  dict->SetBoolean("focusable", android_node->IsFocusable());
+  dict->SetBoolean("focused", android_node->IsFocused());
+  dict->SetBoolean("clickable", android_node->IsClickable());
+  dict->SetBoolean("editable_text", android_node->IsEditableText());
+  dict->SetBoolean("checkable", android_node->IsCheckable());
+  dict->SetBoolean("checked", android_node->IsChecked());
+  dict->SetBoolean("disabled", !android_node->IsEnabled());
+  dict->SetBoolean("scrollable", android_node->IsScrollable());
+  dict->SetBoolean("password", android_node->IsPassword());
+  dict->SetBoolean("selected", android_node->IsSelected());
+  dict->SetBoolean("invisible", !android_node->IsVisibleToUser());
 
   // String attributes.
-  dict->SetString("name", base::android::ConvertJavaStringToUTF8(
-      android_node->GetNameJNI(env, NULL)));
+  dict->SetString("name", android_node->GetText());
 
   // Int attributes.
-  dict->SetInteger("item_index",
-                   android_node->GetItemIndexJNI(env, NULL));
-  dict->SetInteger("item_count",
-                   android_node->GetItemCountJNI(env, NULL));
+  dict->SetInteger("item_index", android_node->GetItemIndex());
+  dict->SetInteger("item_count", android_node->GetItemCount());
 }
 
 bool AccessibilityTreeFormatter::IncludeChildren(
     const BrowserAccessibility& node) {
   const BrowserAccessibilityAndroid* android_node =
       static_cast<const BrowserAccessibilityAndroid*>(&node);
-  JNIEnv* env = base::android::AttachCurrentThread();
-
-  return 0 != android_node->GetChildCountJNI(env, NULL);
+  return !android_node->IsLeaf();
 }
 
 string16 AccessibilityTreeFormatter::ToString(const DictionaryValue& dict,