Revert 207875 "Native Android accessibility."

trunk/src/content/browser/accessibility/accessibility_tree_formatter_android.cc

 // Copyright 2013 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/accessibility_tree_formatter.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 34 matching lines @@
 };
 }
 
 void AccessibilityTreeFormatter::Initialize() {
 }
 
 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", android_node->GetClassName());
+  dict->SetString("class", base::android::ConvertJavaStringToUTF8(
+      android_node->GetClassNameJNI(env, NULL)));
 
   // Bool attributes.
-  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());
+  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));
 
   // String attributes.
-  dict->SetString("name", android_node->GetText());
+  dict->SetString("name", base::android::ConvertJavaStringToUTF8(
+      android_node->GetNameJNI(env, NULL)));
 
   // Int attributes.
-  dict->SetInteger("item_index", android_node->GetItemIndex());
-  dict->SetInteger("item_count", android_node->GetItemCount());
+  dict->SetInteger("item_index",
+                   android_node->GetItemIndexJNI(env, NULL));
+  dict->SetInteger("item_count",
+                   android_node->GetItemCountJNI(env, NULL));
 }
 
 bool AccessibilityTreeFormatter::IncludeChildren(
     const BrowserAccessibility& node) {
   const BrowserAccessibilityAndroid* android_node =
       static_cast<const BrowserAccessibilityAndroid*>(&node);
-  return !android_node->IsLeaf();
+  JNIEnv* env = base::android::AttachCurrentThread();
+
+  return 0 != android_node->GetChildCountJNI(env, NULL);
 }
 
 string16 AccessibilityTreeFormatter::ToString(const DictionaryValue& dict,
                                               const string16& indent) {
   string16 line;
 
   string16 class_value;
   dict.GetString("class", &class_value);
   WriteAttribute(true, UTF16ToUTF8(class_value), &line);
 
@@ skipping 48 matching lines @@
 const std::string AccessibilityTreeFormatter::GetAllowString() {
   return "@ANDROID-ALLOW:";
 }
 
 // static
 const std::string AccessibilityTreeFormatter::GetDenyString() {
   return "@ANDROID-DENY:";
 }
 
 }  // namespace content