From c1f9be74a4e9d01125fa6f6ae97385e6f6e04a05 Mon Sep 17 00:00:00 2001 From: "dmazzoni@chromium.org" Date: Thu, 10 Apr 2014 13:15:46 +0000 Subject: Refactor BrowserAccessibility to prepare for AXNode (re-land) The only purpose of this change is to rename some member variables and accessors in BrowserAccessibility so that in the subsequent change we can repurpose BrowserAccessibility to make use of AXNode instead. There should be no code logic changes here - just look at browser_accessibility.h, everything else just follows from that. BUG=316726 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=262673 Review URL: https://codereview.chromium.org/224803005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262956 0039d316-1c4b-4281-b951-d872f2087c98 --- .../accessibility/browser_accessibility_win_unittest.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'content/browser/accessibility/browser_accessibility_win_unittest.cc') diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc index 42b211b..09704ea 100644 --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc @@ -618,9 +618,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { // Verify the root is as we expect by default. BrowserAccessibility* root = manager->GetRoot(); - EXPECT_EQ(0, root->renderer_id()); - EXPECT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->role()); - EXPECT_EQ(busy_state | readonly_state | enabled_state, root->state()); + EXPECT_EQ(0, root->GetId()); + EXPECT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->GetRole()); + EXPECT_EQ(busy_state | readonly_state | enabled_state, root->GetState()); // Tree with a child textfield. ui::AXNodeData tree1_1; @@ -649,8 +649,8 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { EXPECT_NE(root, manager->GetRoot()); // And the proper child remains. - EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, acc1_2->role()); - EXPECT_EQ(2, acc1_2->renderer_id()); + EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, acc1_2->GetRole()); + EXPECT_EQ(2, acc1_2->GetId()); // Tree with a child button. ui::AXNodeData tree2_1; @@ -676,8 +676,8 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) { EXPECT_NE(root, manager->GetRoot()); // And the new child exists. - EXPECT_EQ(ui::AX_ROLE_BUTTON, acc2_2->role()); - EXPECT_EQ(3, acc2_2->renderer_id()); + EXPECT_EQ(ui::AX_ROLE_BUTTON, acc2_2->GetRole()); + EXPECT_EQ(3, acc2_2->GetId()); // Ensure we properly cleaned up. manager.reset(); -- cgit v1.1