| Index: components/sync/base/cancelation_signal.cc
|
| diff --git a/components/sync/base/cancelation_signal.cc b/components/sync/base/cancelation_signal.cc
|
| index a0c99421d4f9dd63c652581d40252f5faf2925ba..e68a244a8caa6651c2cbf25e3a6eaa4e224f6961 100644
|
| --- a/components/sync/base/cancelation_signal.cc
|
| +++ b/components/sync/base/cancelation_signal.cc
|
| @@ -9,7 +9,7 @@
|
|
|
| namespace syncer {
|
|
|
| -CancelationSignal::CancelationSignal() : signalled_(false), handler_(NULL) {}
|
| +CancelationSignal::CancelationSignal() : signalled_(false), handler_(nullptr) {}
|
|
|
| CancelationSignal::~CancelationSignal() {
|
| DCHECK(!handler_);
|
| @@ -29,7 +29,7 @@ bool CancelationSignal::TryRegisterHandler(CancelationObserver* handler) {
|
| void CancelationSignal::UnregisterHandler(CancelationObserver* handler) {
|
| base::AutoLock lock(signal_lock_);
|
| DCHECK_EQ(handler_, handler);
|
| - handler_ = NULL;
|
| + handler_ = nullptr;
|
| }
|
|
|
| bool CancelationSignal::IsSignalled() {
|
|
|