| Index: base/observer_list_threadsafe.h
|
| diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
|
| index 46ce88066931150c0bce56de59c5b9d7f373f9c6..5205a5a9d1f47f4f696592195269c290cf874e1f 100644
|
| --- a/base/observer_list_threadsafe.h
|
| +++ b/base/observer_list_threadsafe.h
|
| @@ -111,7 +111,7 @@ class ObserverListThreadSafe
|
| if (!base::MessageLoop::current())
|
| return;
|
|
|
| - ObserverList<ObserverType>* list = NULL;
|
| + ObserverList<ObserverType>* list = nullptr;
|
| base::PlatformThreadId thread_id = base::PlatformThread::CurrentId();
|
| {
|
| base::AutoLock lock(list_lock_);
|
| @@ -128,8 +128,8 @@ class ObserverListThreadSafe
|
| // If the observer to be removed is in the list, RemoveObserver MUST
|
| // be called from the same thread which called AddObserver.
|
| void RemoveObserver(ObserverType* obs) {
|
| - ObserverListContext* context = NULL;
|
| - ObserverList<ObserverType>* list = NULL;
|
| + ObserverListContext* context = nullptr;
|
| + ObserverList<ObserverType>* list = nullptr;
|
| base::PlatformThreadId thread_id = base::PlatformThread::CurrentId();
|
| {
|
| base::AutoLock lock(list_lock_);
|
| @@ -230,7 +230,7 @@ class ObserverListThreadSafe
|
| {
|
| typename ObserverList<ObserverType>::Iterator it(&context->list);
|
| ObserverType* obs;
|
| - while ((obs = it.GetNext()) != NULL)
|
| + while ((obs = it.GetNext()) != nullptr)
|
| method.Run(obs);
|
| }
|
|
|
|
|