| 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 49ad04cb43305b608afcbea7414395c739a52395..7b261ffe11e1d20a771a196dd168f1424b98509e 100644
|
| --- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
|
| @@ -142,7 +142,7 @@ TEST_F(BrowserAccessibilityTest, TestNoLeaks) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, button, checkbox),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
|
|
|
| // Delete the manager and test that all 3 instances are deleted.
|
| @@ -153,12 +153,12 @@ TEST_F(BrowserAccessibilityTest, TestNoLeaks) {
|
| // to get new references to two of the three nodes in the tree.
|
| manager.reset(BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, button, checkbox),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
|
| IAccessible* root_accessible =
|
| manager->GetRoot()->ToBrowserAccessibilityWin();
|
| - IDispatch* root_iaccessible = NULL;
|
| - IDispatch* child1_iaccessible = NULL;
|
| + IDispatch* root_iaccessible = nullptr;
|
| + IDispatch* child1_iaccessible = nullptr;
|
| base::win::ScopedVariant childid_self(CHILDID_SELF);
|
| HRESULT hr = root_accessible->get_accChild(childid_self, &root_iaccessible);
|
| ASSERT_EQ(S_OK, hr);
|
| @@ -203,7 +203,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, text),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
|
|
| // Query for the text IAccessible and verify that it returns "old text" as its
|
| // value.
|
| @@ -299,7 +299,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, div, text3, text4),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(4, CountedBrowserAccessibility::num_instances());
|
|
|
| // Notify the BrowserAccessibilityManager that the div node and its children
|
| @@ -343,7 +343,7 @@ TEST_F(BrowserAccessibilityTest, TestTextBoundaries) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, text1),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(2, CountedBrowserAccessibility::num_instances());
|
|
|
| BrowserAccessibilityWin* root_obj =
|
| @@ -443,7 +443,7 @@ TEST_F(BrowserAccessibilityTest, TestSimpleHypertext) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| BrowserAccessibilityManager::Create(
|
| MakeAXTreeUpdate(root, root, text1, text2),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(3, CountedBrowserAccessibility::num_instances());
|
|
|
| BrowserAccessibilityWin* root_obj =
|
| @@ -535,7 +535,7 @@ TEST_F(BrowserAccessibilityTest, TestComplexHypertext) {
|
| MakeAXTreeUpdate(root,
|
| text1, button1, button1_text,
|
| text2, link1, link1_text),
|
| - NULL, new CountedBrowserAccessibilityFactory()));
|
| + nullptr, new CountedBrowserAccessibilityFactory()));
|
| ASSERT_EQ(7, CountedBrowserAccessibility::num_instances());
|
|
|
| BrowserAccessibilityWin* root_obj =
|
| @@ -608,7 +608,7 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
|
| scoped_ptr<BrowserAccessibilityManager> manager(
|
| new BrowserAccessibilityManagerWin(
|
| BrowserAccessibilityManagerWin::GetEmptyDocument(),
|
| - NULL,
|
| + nullptr,
|
| new CountedBrowserAccessibilityFactory()));
|
|
|
| // Verify the root is as we expect by default.
|
| @@ -688,7 +688,7 @@ TEST_F(BrowserAccessibilityTest, EmptyDocHasUniqueIdWin) {
|
| scoped_ptr<BrowserAccessibilityManagerWin> manager(
|
| new BrowserAccessibilityManagerWin(
|
| BrowserAccessibilityManagerWin::GetEmptyDocument(),
|
| - NULL,
|
| + nullptr,
|
| new CountedBrowserAccessibilityFactory()));
|
|
|
| // Verify the root is as we expect by default.
|
|
|