[C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr

content/browser/accessibility/browser_accessibility_manager.cc

Index: content/browser/accessibility/browser_accessibility_manager.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index bd745cd12fe49baa667bb0591b29c9bb2300b778..435e754594dbe4301c091338cf0b646735dc890f 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -69,7 +69,7 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
     : delegate_(delegate),
       factory_(factory),
       tree_(new ui::AXSerializableTree()),
-      focus_(NULL),
+      focus_(nullptr),
       osk_state_(OSK_ALLOWED) {
   tree_->SetDelegate(this);
 }
@@ -81,14 +81,14 @@ BrowserAccessibilityManager::BrowserAccessibilityManager(
     : delegate_(delegate),
       factory_(factory),
       tree_(new ui::AXSerializableTree()),
-      focus_(NULL),
+      focus_(nullptr),
       osk_state_(OSK_ALLOWED) {
   tree_->SetDelegate(this);
   Initialize(initial_tree);
 }
 
 BrowserAccessibilityManager::~BrowserAccessibilityManager() {
-  tree_.reset(NULL);
+  tree_.reset(nullptr);
 }
 
 void BrowserAccessibilityManager::Initialize(
@@ -130,7 +130,7 @@ BrowserAccessibility* BrowserAccessibilityManager::GetFromID(int32 id) {
       id_wrapper_map_.find(id);
   if (iter != id_wrapper_map_.end())
     return iter->second;
-  return NULL;
+  return nullptr;
 }
 
 void BrowserAccessibilityManager::OnWindowFocused() {
@@ -229,7 +229,7 @@ BrowserAccessibility* BrowserAccessibilityManager::GetActiveDescendantFocus(
     BrowserAccessibility* root) {
   BrowserAccessibility* node = BrowserAccessibilityManager::GetFocus(root);
   if (!node)
-    return NULL;
+    return nullptr;
 
   int active_descendant_id;
   if (node->GetIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID,
@@ -247,7 +247,7 @@ BrowserAccessibility* BrowserAccessibilityManager::GetFocus(
   if (focus_ && (!root || focus_->IsDescendantOf(root->node())))
     return GetFromAXNode(focus_);
 
-  return NULL;
+  return nullptr;
 }
 
 void BrowserAccessibilityManager::SetFocus(ui::AXNode* node, bool notify) {
@@ -301,7 +301,7 @@ gfx::Rect BrowserAccessibilityManager::GetViewBounds() {
 BrowserAccessibility* BrowserAccessibilityManager::NextInTreeOrder(
     BrowserAccessibility* node) {
   if (!node)
-    return NULL;
+    return nullptr;
 
   if (node->PlatformChildCount() > 0)
     return node->PlatformGetChild(0);
@@ -314,13 +314,13 @@ BrowserAccessibility* BrowserAccessibilityManager::NextInTreeOrder(
     node = node->GetParent();
   }
 
-  return NULL;
+  return nullptr;
 }
 
 BrowserAccessibility* BrowserAccessibilityManager::PreviousInTreeOrder(
     BrowserAccessibility* node) {
   if (!node)
-    return NULL;
+    return nullptr;
 
   if (node->GetParent() && node->GetIndexInParent() > 0) {
     node = node->GetParent()->PlatformGetChild(node->GetIndexInParent() - 1);
@@ -337,7 +337,7 @@ void BrowserAccessibilityManager::OnNodeWillBeDeleted(ui::AXNode* node) {
     if (node != tree_->GetRoot())
       SetFocus(tree_->GetRoot(), false);
     else
-      focus_ = NULL;
+      focus_ = nullptr;
   }
   if (id_wrapper_map_.find(node->id()) == id_wrapper_map_.end())
     return;