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

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

Issue 642313003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Including id in the AUTHORS file. Created 6 years, 2 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
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 9980de6196dad8fe52ac5d78377538d34b92f05b..09e28d13ca45852c5b1f307feded737b48b7f7c5 100644
--- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
@@ -95,14 +95,14 @@ class TestBrowserAccessibilityDelegate
}
virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
override {
- return NULL;
+ return nullptr;
}
virtual BrowserAccessibilityManager* AccessibilityGetChildFrame(
int accessibility_node_id) override {
- return NULL;
+ return nullptr;
}
virtual BrowserAccessibility* AccessibilityGetParentFrame() override {
- return NULL;
+ return nullptr;
}
bool got_fatal_error() const { return got_fatal_error_; }
@@ -146,7 +146,7 @@ TEST(BrowserAccessibilityManagerTest, TestNoLeaks) {
BrowserAccessibilityManager* manager =
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, button, checkbox),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory());
ASSERT_EQ(3, CountedBrowserAccessibility::global_obj_count_);
@@ -160,7 +160,7 @@ TEST(BrowserAccessibilityManagerTest, TestNoLeaks) {
manager =
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, button, checkbox),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory());
ASSERT_EQ(3, CountedBrowserAccessibility::global_obj_count_);
@@ -251,7 +251,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects) {
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(tree1_root,
tree1_child1, tree1_child2, tree1_child3),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory());
ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
@@ -427,7 +427,7 @@ TEST(BrowserAccessibilityManagerTest, TestReuseBrowserAccessibilityObjects2) {
tree1_child1, tree1_grandchild1,
tree1_child2, tree1_grandchild2,
tree1_child3, tree1_grandchild3),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory());
ASSERT_EQ(8, CountedBrowserAccessibility::global_obj_count_);
@@ -555,7 +555,7 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) {
BrowserAccessibilityManager* manager =
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(tree1_1, tree1_2, tree1_3, tree1_4),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory());
ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
@@ -689,7 +689,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
scoped_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, static_text, inline_text1, inline_text2),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -777,7 +777,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
scoped_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, static_text, inline_text1, inline_text2),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -875,7 +875,7 @@ TEST(BrowserAccessibilityManagerTest, MAYBE_BoundsForRangeOnParentElement) {
MakeAXTreeUpdate(
root, div, static_text1, img,
static_text2, inline_text1, inline_text2),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -922,7 +922,7 @@ TEST(BrowserAccessibilityManagerTest, NextPreviousInTreeOrder) {
scoped_ptr<BrowserAccessibilityManager> manager(
BrowserAccessibilityManager::Create(
MakeAXTreeUpdate(root, node2, node3, node4, node5),
- NULL,
+ nullptr,
new CountedBrowserAccessibilityFactory()));
BrowserAccessibility* root_accessible = manager->GetRoot();
@@ -932,14 +932,14 @@ TEST(BrowserAccessibilityManagerTest, NextPreviousInTreeOrder) {
node3_accessible->PlatformGetChild(0);
BrowserAccessibility* node5_accessible = root_accessible->PlatformGetChild(2);
- ASSERT_EQ(NULL, manager->NextInTreeOrder(NULL));
+ ASSERT_EQ(nullptr, manager->NextInTreeOrder(nullptr));
ASSERT_EQ(node2_accessible, manager->NextInTreeOrder(root_accessible));
ASSERT_EQ(node3_accessible, manager->NextInTreeOrder(node2_accessible));
ASSERT_EQ(node4_accessible, manager->NextInTreeOrder(node3_accessible));
ASSERT_EQ(node5_accessible, manager->NextInTreeOrder(node4_accessible));
- ASSERT_EQ(NULL, manager->NextInTreeOrder(node5_accessible));
+ ASSERT_EQ(nullptr, manager->NextInTreeOrder(node5_accessible));
- ASSERT_EQ(NULL, manager->PreviousInTreeOrder(NULL));
+ ASSERT_EQ(nullptr, manager->PreviousInTreeOrder(nullptr));
ASSERT_EQ(node4_accessible, manager->PreviousInTreeOrder(node5_accessible));
ASSERT_EQ(node3_accessible, manager->PreviousInTreeOrder(node4_accessible));
ASSERT_EQ(node2_accessible, manager->PreviousInTreeOrder(node3_accessible));

Powered by Google App Engine
This is Rietveld 408576698