Move some AX attrs from AXNodeData to AXTreeData.

ui/accessibility/ax_generated_tree_unittest.cc

Index: ui/accessibility/ax_generated_tree_unittest.cc
diff --git a/ui/accessibility/ax_generated_tree_unittest.cc b/ui/accessibility/ax_generated_tree_unittest.cc
index 88cda14966d4719b495ffb4dc4acca9bf456feb6..7a5a86480497a17bf33cc330071ecf79db2955c6 100644
--- a/ui/accessibility/ax_generated_tree_unittest.cc
+++ b/ui/accessibility/ax_generated_tree_unittest.cc
@@ -152,11 +152,11 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) {
 
         // Start by serializing tree0 and unserializing it into a new
         // empty tree |dst_tree|.
-        scoped_ptr<AXTreeSource<const AXNode*, AXNodeData> > tree0_source(
-            tree0.CreateTreeSource());
-        AXTreeSerializer<const AXNode*, AXNodeData> serializer(
+        scoped_ptr<AXTreeSource<const AXNode*, AXNodeData, AXTreeData> >
+            tree0_source(tree0.CreateTreeSource());
+        AXTreeSerializer<const AXNode*, AXNodeData, AXTreeData> serializer(
             tree0_source.get());
-        AXTreeUpdate<AXNodeData> update0;
+        AXTreeUpdate update0;
         serializer.SerializeChanges(tree0.root(), &update0);
 
         AXTree dst_tree;
@@ -167,13 +167,13 @@ TEST(AXGeneratedTreeTest, SerializeGeneratedTrees) {
 
         // Next, pretend that tree0 turned into tree1, and serialize
         // a sequence of updates to |dst_tree| to match.
-        scoped_ptr<AXTreeSource<const AXNode*, AXNodeData> > tree1_source(
-            tree1.CreateTreeSource());
+        scoped_ptr<AXTreeSource<const AXNode*, AXNodeData, AXTreeData> >
+            tree1_source(tree1.CreateTreeSource());
         serializer.ChangeTreeSourceForTesting(tree1_source.get());
 
         for (int k_index = 0; k_index < tree_size; ++k_index) {
           int id = 1 + (k + k_index) % tree_size;
-          AXTreeUpdate<AXNodeData> update;
+          AXTreeUpdate update;
           serializer.SerializeChanges(tree1.GetFromId(id), &update);
           ASSERT_TRUE(dst_tree.Unserialize(update));
         }