Move some AX attrs from AXNodeData to AXTreeData.

content/browser/web_contents/web_contents_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/web_contents/web_contents_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
@@ skipping 86 matching lines @@
         static_cast<BrowserAccessibilityAndroid*>(
             node->PlatformGetChild(i));
     Java_WebContentsImpl_addAccessibilityNodeAsChild(env,
         j_node.obj(), WalkAXTreeDepthFirst(env, child, scale_factor, y_offset,
             x_scroll).obj());
   }
   return j_node;
 }
 
 // Walks over the AXTreeUpdate and creates a light weight snapshot.
-void AXTreeSnapshotCallback(const ScopedJavaGlobalRef<jobject>& callback,
-                            float scale_factor,
-                            float y_offset,
-                            float x_scroll,
-                            const ui::AXTreeUpdate<ui::AXNodeData>& result) {
+void AXTreeSnapshotCallback(
+    const ScopedJavaGlobalRef<jobject>& callback,
+    float scale_factor,
+    float y_offset,
+    float x_scroll,
+    const ui::AXTreeUpdate& result) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (result.nodes.empty()) {
     Java_WebContentsImpl_onAccessibilitySnapshot(env, nullptr, callback.obj());
     return;
   }
   scoped_ptr<BrowserAccessibilityManagerAndroid> manager(
       static_cast<BrowserAccessibilityManagerAndroid*>(
           BrowserAccessibilityManager::Create(result, nullptr)));
   manager->set_prune_tree_for_screen_reader(false);
   BrowserAccessibilityAndroid* root =
@@ skipping 425 matching lines @@
   web_contents_->StopMediaSession();
 }
 
 ScopedJavaLocalRef<jstring>  WebContentsAndroid::GetEncoding(
     JNIEnv* env, jobject obj) const {
   return base::android::ConvertUTF8ToJavaString(env,
                                                 web_contents_->GetEncoding());
 }
 
 }  // namespace content