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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/browser_accessibility_win_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_win.h ('k') | content/browser/accessibility/cross_platform_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: 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 e8c236a5195d5ae1413c44eb43a142c6c7a07a39..889fb81b73b8a2c4501fe0e7751295afbcbf869e 100644
--- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/browser/accessibility/browser_accessibility_win.h"
+
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#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"
@@ -13,7 +16,6 @@
#include "content/browser/accessibility/browser_accessibility_manager.h"
#include "content/browser/accessibility/browser_accessibility_manager_win.h"
#include "content/browser/accessibility/browser_accessibility_state_impl.h"
-#include "content/browser/accessibility/browser_accessibility_win.h"
#include "content/browser/renderer_host/legacy_render_widget_host_win.h"
#include "content/common/accessibility_messages.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -145,10 +147,10 @@ TEST_F(BrowserAccessibilityTest, TestNoLeaks) {
// BrowserAccessibility, and ensure that exactly 3 instances were
// created. Note that the manager takes ownership of the factory.
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, button, checkbox),
- NULL, new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, button, checkbox), NULL,
+ new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
// Delete the manager and test that all 3 instances are deleted.
@@ -205,10 +207,10 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
// ui::AXNodeData tree and a factory for an instance-counting
// BrowserAccessibility.
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, text),
- NULL, new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, text), NULL,
+ new CountedBrowserAccessibilityFactory()));
// Query for the text IAccessible and verify that it returns "old text" as its
// value.
@@ -301,10 +303,10 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
// BrowserAccessibility and ensure that exactly 4 instances were
// created. Note that the manager takes ownership of the factory.
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, div, text3, text4),
- NULL, new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, div, text3, text4), NULL,
+ new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(4, CountedBrowserAccessibility::num_instances());
// Notify the BrowserAccessibilityManager that the div node and its children
@@ -387,10 +389,10 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
ui::AX_ATTR_WORD_STARTS, word_start_offsets2);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, text_field, static_text1, inline_box1,
- line_break, static_text2, inline_box2),
+ line_break, static_text2, inline_box2),
nullptr, new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(7, CountedBrowserAccessibility::num_instances());
@@ -508,7 +510,7 @@ TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) {
root.child_ids.push_back(text2.id);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, text1, text2), nullptr,
new CountedBrowserAccessibilityFactory()));
@@ -628,7 +630,7 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
root.child_ids.push_back(link.id);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, text1, combo_box, text2, check_box, button,
button_text, link, link_text),
@@ -725,10 +727,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
const int32_t busy_state = 1 << ui::AX_STATE_BUSY;
const int32_t readonly_state = 1 << ui::AX_STATE_READ_ONLY;
const int32_t enabled_state = 1 << ui::AX_STATE_ENABLED;
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
new BrowserAccessibilityManagerWin(
- BrowserAccessibilityManagerWin::GetEmptyDocument(),
- NULL,
+ BrowserAccessibilityManagerWin::GetEmptyDocument(), NULL,
new CountedBrowserAccessibilityFactory()));
// Verify the root is as we expect by default.
@@ -805,10 +806,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
// BrowserAccessibilityManager code before BrowserAccessibilityManagerWin
// was initialized.
TEST_F(BrowserAccessibilityTest, EmptyDocHasUniqueIdWin) {
- scoped_ptr<BrowserAccessibilityManagerWin> manager(
+ std::unique_ptr<BrowserAccessibilityManagerWin> manager(
new BrowserAccessibilityManagerWin(
- BrowserAccessibilityManagerWin::GetEmptyDocument(),
- NULL,
+ BrowserAccessibilityManagerWin::GetEmptyDocument(), NULL,
new CountedBrowserAccessibilityFactory()));
// Verify the root is as we expect by default.
@@ -846,7 +846,7 @@ TEST_F(BrowserAccessibilityTest, TestIA2Attributes) {
root.child_ids.push_back(3);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, pseudo_before, checkbox), nullptr,
new CountedBrowserAccessibilityFactory()));
@@ -951,7 +951,7 @@ TEST_F(BrowserAccessibilityTest, TestValueAttributeInTextControls) {
root.child_ids.push_back(10); // Slider.
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, combo_box, combo_box_text, search_box,
search_box_text, new_line, text_field, link,
@@ -1113,7 +1113,7 @@ TEST_F(BrowserAccessibilityTest, TestWordBoundariesInTextControls) {
root.child_ids.push_back(7); // Text field.
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, textarea, textarea_div, textarea_text,
textarea_line1, textarea_line2, text_field,
@@ -1214,10 +1214,10 @@ TEST_F(BrowserAccessibilityTest, TestCaretAndSelectionInSimpleFields) {
root.child_ids.push_back(3);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- MakeAXTreeUpdate(root, combo_box, text_field),
- nullptr, new CountedBrowserAccessibilityFactory()));
+ MakeAXTreeUpdate(root, combo_box, text_field), nullptr,
+ new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
ASSERT_NE(nullptr, manager->GetRoot());
@@ -1334,10 +1334,9 @@ TEST_F(BrowserAccessibilityTest, TestCaretInContentEditables) {
update.tree_data.sel_focus_offset = 1;
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- update,
- nullptr, new CountedBrowserAccessibilityFactory()));
+ update, nullptr, new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(5, CountedBrowserAccessibility::num_instances());
ASSERT_NE(nullptr, manager->GetRoot());
@@ -1452,10 +1451,9 @@ TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) {
update.tree_data.sel_focus_offset = 4;
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
- update,
- nullptr, new CountedBrowserAccessibilityFactory()));
+ update, nullptr, new CountedBrowserAccessibilityFactory()));
ASSERT_EQ(5, CountedBrowserAccessibility::num_instances());
ASSERT_NE(nullptr, manager->GetRoot());
@@ -1588,7 +1586,7 @@ TEST_F(BrowserAccessibilityTest, TestIAccessibleHyperlink) {
div.child_ids.push_back(4);
CountedBrowserAccessibility::reset();
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, div, link, text), nullptr,
new CountedBrowserAccessibilityFactory()));
@@ -1739,7 +1737,7 @@ TEST_F(BrowserAccessibilityTest, TestDeepestFirstLastChild) {
child2_child2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
child2.child_ids.push_back(5);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, child1, child2, child2_child1, child2_child2),
nullptr, new CountedBrowserAccessibilityFactory()));
@@ -1822,7 +1820,7 @@ TEST_F(BrowserAccessibilityTest, TestInheritedStringAttributes) {
child2_child2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
child2.child_ids.push_back(5);
- scoped_ptr<BrowserAccessibilityManager> manager(
+ std::unique_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, child1, child2, child2_child1, child2_child2),
nullptr, new CountedBrowserAccessibilityFactory()));
@@ -1924,10 +1922,9 @@ TEST_F(BrowserAccessibilityTest, UniqueIdWinInvalidAfterDeletingTree) {
child_node.id = 2;
root_node.child_ids.push_back(2);
- scoped_ptr<BrowserAccessibilityManagerWin> manager(
+ std::unique_ptr<BrowserAccessibilityManagerWin> manager(
new BrowserAccessibilityManagerWin(
- MakeAXTreeUpdate(root_node, child_node),
- nullptr,
+ MakeAXTreeUpdate(root_node, child_node), nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root = manager->GetRoot();
@@ -1986,10 +1983,9 @@ TEST_F(BrowserAccessibilityTest, AccChildOnlyReturnsDescendants) {
child_node.id = 2;
root_node.child_ids.push_back(2);
- scoped_ptr<BrowserAccessibilityManagerWin> manager(
+ std::unique_ptr<BrowserAccessibilityManagerWin> manager(
new BrowserAccessibilityManagerWin(
- MakeAXTreeUpdate(root_node, child_node),
- nullptr,
+ MakeAXTreeUpdate(root_node, child_node), nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root = manager->GetRoot();
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win.h ('k') | content/browser/accessibility/cross_platform_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698