Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/browser_accessibility_win_unittest.cc

 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 951 matching lines @@
       (1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);
   link.SetName("here");
 
   ui::AXNodeData link_text;
   link_text.id = 5;
   link_text.role = ui::AX_ROLE_STATIC_TEXT;
   link_text.state = (1 << ui::AX_STATE_EDITABLE) |
       (1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);
   link_text.SetName("here");
 
-  // Place the caret between 'h' and 'e'.
-  root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OBJECT_ID, 5);
-  root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OFFSET, 1);
-  root.AddIntAttribute(ui::AX_ATTR_FOCUS_OBJECT_ID, 5);
-  root.AddIntAttribute(ui::AX_ATTR_FOCUS_OFFSET, 1);
-
   root.child_ids.push_back(2);
   div_editable.child_ids.push_back(3);
   div_editable.child_ids.push_back(4);
   link.child_ids.push_back(5);
 
+  ui::AXTreeUpdate update = MakeAXTreeUpdate(
+      root, div_editable, link, link_text, text);
+
+  // Place the caret between 'h' and 'e'.
+  update.has_tree_data = true;
+  update.tree_data.sel_anchor_object_id = 5;
+  update.tree_data.sel_anchor_offset = 1;
+  update.tree_data.sel_focus_object_id = 5;
+  update.tree_data.sel_focus_offset = 1;
+
   CountedBrowserAccessibility::reset();
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
-          MakeAXTreeUpdate(root, div_editable, link, link_text, text),
+          update,
           nullptr, new CountedBrowserAccessibilityFactory()));
   ASSERT_EQ(5, CountedBrowserAccessibility::num_instances());
 
   ASSERT_NE(nullptr, manager->GetRoot());
   BrowserAccessibilityWin* root_accessible =
       manager->GetRoot()->ToBrowserAccessibilityWin();
       ASSERT_NE(nullptr, root_accessible);
       ASSERT_EQ(1U, root_accessible->PlatformChildCount());
 
   BrowserAccessibilityWin* div_editable_accessible =
@@ skipping 80 matching lines @@
   link.role = ui::AX_ROLE_LINK;
   link.state = (1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);
   link.SetName("here");
 
   ui::AXNodeData link_text;
   link_text.id = 5;
   link_text.role = ui::AX_ROLE_STATIC_TEXT;
   link_text.state = (1 << ui::AX_STATE_FOCUSABLE) | (1 << ui::AX_STATE_LINKED);
   link_text.SetName("here");
 
-  // Select the following part of the text: "lick here".
-  root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OBJECT_ID, 3);
-  root.AddIntAttribute(ui::AX_ATTR_ANCHOR_OFFSET, 1);
-  root.AddIntAttribute(ui::AX_ATTR_FOCUS_OBJECT_ID, 5);
-  root.AddIntAttribute(ui::AX_ATTR_FOCUS_OFFSET, 4);
-
   root.child_ids.push_back(2);
   div_editable.child_ids.push_back(3);
   div_editable.child_ids.push_back(4);
   link.child_ids.push_back(5);
 
+  ui::AXTreeUpdate update =
+      MakeAXTreeUpdate(root, div_editable, link, link_text, text);
+
+  // Select the following part of the text: "lick here".
+  update.has_tree_data = true;
+  update.tree_data.sel_anchor_object_id = 3;
+  update.tree_data.sel_anchor_offset = 1;
+  update.tree_data.sel_focus_object_id = 5;
+  update.tree_data.sel_focus_offset = 4;
+
   CountedBrowserAccessibility::reset();
   scoped_ptr<BrowserAccessibilityManager> manager(
       BrowserAccessibilityManager::Create(
-          MakeAXTreeUpdate(root, div_editable, link, link_text, text),
+          update,
           nullptr, new CountedBrowserAccessibilityFactory()));
   ASSERT_EQ(5, CountedBrowserAccessibility::num_instances());
 
   ASSERT_NE(nullptr, manager->GetRoot());
   BrowserAccessibilityWin* root_accessible =
       manager->GetRoot()->ToBrowserAccessibilityWin();
       ASSERT_NE(nullptr, root_accessible);
       ASSERT_EQ(1U, root_accessible->PlatformChildCount());
 
   BrowserAccessibilityWin* div_editable_accessible =
@@ skipping 302 matching lines @@
 }
 
 TEST_F(BrowserAccessibilityTest, TestSanitizeStringAttributeForIA2) {
   base::string16 input(L"\\:=,;");
   base::string16 output;
   BrowserAccessibilityWin::SanitizeStringAttributeForIA2(input, &output);
   EXPECT_EQ(L"\\\\\\:\\=\\,\\;", output);
 }
 
 }  // namespace content