Move some AX attrs from AXNodeData to AXTreeData.

chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using views::AXAuraObjCache;
 using views::AXAuraObjWrapper;
 using views::Textfield;
 using views::View;
 using views::Widget;
 
-using AuraAXTreeSerializer =
-    ui::AXTreeSerializer<views::AXAuraObjWrapper*, ui::AXNodeData>;
+using AuraAXTreeSerializer = ui::AXTreeSerializer<views::AXAuraObjWrapper*,
+                                                  ui::AXNodeData,
+                                                  ui::AXTreeData>;
 
 // Helper to count the number of nodes in a tree.
 size_t GetSize(AXAuraObjWrapper* tree) {
   size_t count = 1;
 
   std::vector<AXAuraObjWrapper*> out_children;
   tree->GetChildren(&out_children);
 
   for (size_t i = 0; i < out_children.size(); ++i)
     count += GetSize(out_children[i]);
@@ skipping 86 matching lines @@
 
   // Focus and verify.
   ASSERT_FALSE(textfield_->HasFocus());
   textfield_wrapper->Focus();
   ASSERT_TRUE(textfield_->HasFocus());
 }
 
 TEST_F(AXTreeSourceAuraTest, Serialize) {
   AXTreeSourceAura ax_tree;
   AuraAXTreeSerializer ax_serializer(&ax_tree);
-  ui::AXTreeUpdate<ui::AXNodeData> out_update;
+  ui::AXTreeUpdate out_update;
 
   // This is the initial serialization.
   ax_serializer.SerializeChanges(ax_tree.GetRoot(), &out_update);
 
   // The update should just be the desktop node since no events have been fired
   // on any controls, so no windows have been cached.
   ASSERT_EQ(1U, out_update.nodes.size());
 
   // Try removing some child views and re-adding which should fire some events.
   content_->RemoveAllChildViews(false /* delete_children */);
   content_->AddChildView(textfield_);
 
   // Grab the textfield since serialization only walks up the tree (not down
   // from root).
   AXAuraObjWrapper* textfield_wrapper =
       AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
 
   // Now, re-serialize.
-  ui::AXTreeUpdate<ui::AXNodeData> out_update2;
+  ui::AXTreeUpdate out_update2;
   ax_serializer.SerializeChanges(textfield_wrapper, &out_update2);
 
   size_t node_count = out_update2.nodes.size();
 
   // We should have far more updates this time around.
   ASSERT_GE(node_count, 10U);
 
   ASSERT_EQ(textfield_wrapper->GetID(), out_update2.nodes[node_count - 1].id);
   ASSERT_EQ(ui::AX_ROLE_TEXT_FIELD, out_update2.nodes[node_count - 1].role);
 }