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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_manager_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « content/browser/accessibility/browser_accessibility_manager.cc ('k') | content/browser/accessibility/browser_accessibility_manager_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/browser_accessibility_manager_unittest.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
index b13338f792e7acd5aade86636f319a0a75576e6e..609a4b6646d5ac51d4073090b208b6c5b975d95e 100644
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -588,9 +588,9 @@ TEST(BrowserAccessibilityManagerTest, TestFatalError) {
CountedBrowserAccessibilityFactory* factory =
new CountedBrowserAccessibilityFactory();
- scoped_ptr<TestBrowserAccessibilityDelegate> delegate(
+ std::unique_ptr<TestBrowserAccessibilityDelegate> delegate(
new TestBrowserAccessibilityDelegate());
- scoped_ptr<BrowserAccessibilityManager> manager;
+ std::unique_ptr<BrowserAccessibilityManager> manager;
ASSERT_FALSE(delegate->got_fatal_error());
manager.reset(BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root),
@@ -682,11 +682,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
static_text.child_ids.push_back(4);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, static_text, inline_text1, inline_text2),
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ nullptr, new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
ASSERT_NE(nullptr, root_accessible);
@@ -769,11 +768,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
static_text.child_ids.push_back(4);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, static_text, inline_text1, inline_text2),
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ nullptr, new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
ASSERT_NE(nullptr, root_accessible);
@@ -831,10 +829,9 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeScrolledWindow) {
ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets1);
static_text.child_ids.push_back(3);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, static_text, inline_text),
- nullptr,
+ MakeAXTreeUpdate(root, static_text, inline_text), nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -912,13 +909,11 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeOnParentElement) {
inline_text2.AddIntListAttribute(
ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets2);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(
- root, div, static_text1, img,
- static_text2, inline_text1, inline_text2),
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, div, static_text1, img, static_text2,
+ inline_text1, inline_text2),
+ nullptr, new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
ASSERT_NE(nullptr, root_accessible);
BrowserAccessibility* div_accessible = root_accessible->PlatformGetChild(0);
@@ -964,10 +959,9 @@ TEST(BrowserAccessibilityManagerTest, TestNextPreviousInTreeOrder) {
node5.id = 5;
root.child_ids.push_back(5);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, node2, node3, node4, node5),
- nullptr,
+ MakeAXTreeUpdate(root, node2, node3, node4, node5), nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -1039,12 +1033,11 @@ TEST(BrowserAccessibilityManagerTest, TestNextPreviousTextOnlyObject) {
text4.role = ui::AX_ROLE_LINE_BREAK;
node5.child_ids.push_back(9);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, node2, node3, node4, node5,
- text1, text2, text3, text4),
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, node2, node3, node4, node5, text1, text2,
+ text3, text4),
+ nullptr, new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
ASSERT_NE(nullptr, root_accessible);
@@ -1149,7 +1142,7 @@ TEST(BrowserAccessibilityManagerTest, TestFindIndicesInCommonParent) {
paragraph_line2.SetName("world.");
paragraph_text.child_ids.push_back(paragraph_line2.id);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, div, button, button_text, line_break,
paragraph, paragraph_text, paragraph_line1,
@@ -1293,7 +1286,7 @@ TEST(BrowserAccessibilityManagerTest, TestGetTextForRange) {
paragraph_line2.SetName("world.");
paragraph_text.child_ids.push_back(paragraph_line2.id);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, div, button, button_text, line_break,
paragraph, paragraph_text, paragraph_line1,
@@ -1403,11 +1396,9 @@ TEST(BrowserAccessibilityManagerTest, DeletingFocusedNodeDoesNotCrash) {
ui::AXTreeUpdate initial_state = MakeAXTreeUpdate(root, node2);
initial_state.has_tree_data = true;
initial_state.tree_data.focus_id = 2;
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- initial_state,
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ initial_state, nullptr, new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(1, manager->GetRoot()->GetId());
ASSERT_EQ(2, manager->GetFocus()->GetId());
@@ -1455,11 +1446,9 @@ TEST(BrowserAccessibilityManagerTest, DeletingFocusedNodeDoesNotCrash2) {
ui::AXTreeUpdate initial_state = MakeAXTreeUpdate(root, node2, node3, node4);
initial_state.has_tree_data = true;
initial_state.tree_data.focus_id = 2;
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- initial_state,
- nullptr,
- new CountedBrowserAccessibilityFactory()));
+ initial_state, nullptr, new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(1, manager->GetRoot()->GetId());
ASSERT_EQ(2, manager->GetFocus()->GetId());
« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager.cc ('k') | content/browser/accessibility/browser_accessibility_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698