Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(941)

Unified Diff: ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc

Issue 2718073003: Views a11y: Convert View's NativeViewAccessibility to a unique_ptr. (Closed)
Patch Set: Fix long lived NVA in test. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/accessibility/native_view_accessibility_win.cc ('k') | ui/views/view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index 87616833a3135b3ee77a3cbd793bf3657b154c84..3a5287614e9d52581935917881aefacfd7ccc0a3 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -158,33 +158,33 @@ TEST_F(TabbedPaneTest, SelectTabWithAccessibleAction) {
// Check the a11y information for each tab.
for (int i = 0; i < kNumTabs; ++i) {
- NativeViewAccessibility* nva = NativeViewAccessibility::Create(GetTabAt(i));
- ui::AXNodeData data = nva->GetData();
+ ui::AXNodeData data =
+ NativeViewAccessibility::Create(GetTabAt(i))->GetData();
SCOPED_TRACE(testing::Message() << "Tab at index: " << i);
EXPECT_EQ(ui::AX_ROLE_TAB, data.role);
EXPECT_EQ(DefaultTabTitle(), data.GetString16Attribute(ui::AX_ATTR_NAME));
EXPECT_TRUE(data.HasStateFlag(ui::AX_STATE_SELECTABLE));
EXPECT_EQ(i == 0, data.HasStateFlag(ui::AX_STATE_SELECTED));
- nva->Destroy();
}
ui::AXActionData action;
action.action = ui::AX_ACTION_SET_SELECTION;
// Select the first tab.
- NativeViewAccessibility* nva = NativeViewAccessibility::Create(GetTabAt(0));
- nva->AccessibilityPerformAction(action);
+
+ NativeViewAccessibility::Create(GetTabAt(0))
+ ->AccessibilityPerformAction(action);
EXPECT_EQ(0, tabbed_pane_->GetSelectedTabIndex());
- nva->Destroy();
// Select the second tab.
- nva = NativeViewAccessibility::Create(GetTabAt(1));
+ std::unique_ptr<NativeViewAccessibility> nva =
+ NativeViewAccessibility::Create(GetTabAt(1));
nva->AccessibilityPerformAction(action);
EXPECT_EQ(1, tabbed_pane_->GetSelectedTabIndex());
// Select the second tab again.
nva->AccessibilityPerformAction(action);
EXPECT_EQ(1, tabbed_pane_->GetSelectedTabIndex());
- nva->Destroy();
+ nva.reset();
widget->CloseNow();
}
« no previous file with comments | « ui/views/accessibility/native_view_accessibility_win.cc ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698