Clean up ObserverList Pointers to use nullptr instad of NULL or 0

base/observer_list.h

Index: base/observer_list.h
diff --git a/base/observer_list.h b/base/observer_list.h
index e473b3250ae58dedc74c1801a500bafe27f377b9..a0f077d14fe524aac0e9f661ec61b764f20bcb0b 100644
--- a/base/observer_list.h
+++ b/base/observer_list.h
@@ -143,13 +143,13 @@ ObserverListBase<ObserverType>::Iterator::~Iterator() {
 template <class ObserverType>
 ObserverType* ObserverListBase<ObserverType>::Iterator::GetNext() {
   if (!list_.get())
-    return NULL;
+    return nullptr;
   ListType& observers = list_->observers_;
   // Advance if the current element is null
   size_t max_index = std::min(max_index_, observers.size());
   while (index_ < max_index && !observers[index_])
     ++index_;
-  return index_ < max_index ? observers[index_++] : NULL;
+  return index_ < max_index ? observers[index_++] : nullptr;
 }
 
 template <class ObserverType>
@@ -170,7 +170,7 @@ void ObserverListBase<ObserverType>::RemoveObserver(ObserverType* obs) {
     std::find(observers_.begin(), observers_.end(), obs);
   if (it != observers_.end()) {
     if (notify_depth_) {
-      *it = 0;
+      *it = nullptr;
     } else {
       observers_.erase(it);
     }
@@ -192,7 +192,7 @@ void ObserverListBase<ObserverType>::Clear() {
   if (notify_depth_) {
     for (typename ListType::iterator it = observers_.begin();
       it != observers_.end(); ++it) {
-      *it = 0;
+      *it = nullptr;
     }
   } else {
     observers_.clear();
@@ -203,7 +203,7 @@ template <class ObserverType>
 void ObserverListBase<ObserverType>::Compact() {
   observers_.erase(
       std::remove(observers_.begin(), observers_.end(),
-                  static_cast<ObserverType*>(NULL)), observers_.end());
+                  static_cast<ObserverType*>(nullptr)), observers_.end());

[Lei Zhang, 2015/04/23 21:07:33]

Can you check to see if you can get rid of the static_cast?

[robliao, 2015/04/23 21:27:28]

MSVC was cool with it, but MSVC tends to be more forgiving. I'll let the CQ find
out about the other compilers.

 }
 
 template <class ObserverType, bool check_empty = false>
@@ -235,7 +235,7 @@ class ObserverList : public ObserverListBase<ObserverType> {
       ObserverListBase<ObserverType>::Iterator it_inside_observer_macro( \
           &observer_list);                                               \
       ObserverType* obs;                                                 \
-      while ((obs = it_inside_observer_macro.GetNext()) != NULL)         \
+      while ((obs = it_inside_observer_macro.GetNext()) != nullptr)         \
         obs->func;                                                       \
     }                                                                    \
   } while (0)