diff options
Diffstat (limited to 'chromium/jingle/notifier')
| -rw-r--r-- | chromium/jingle/notifier/base/xmpp_connection.cc | 2 | ||||
| -rw-r--r-- | chromium/jingle/notifier/listener/non_blocking_push_client_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/jingle/notifier/base/xmpp_connection.cc b/chromium/jingle/notifier/base/xmpp_connection.cc index 4a1e41f1f94..4e5aa6aac4b 100644 --- a/chromium/jingle/notifier/base/xmpp_connection.cc +++ b/chromium/jingle/notifier/base/xmpp_connection.cc @@ -116,7 +116,7 @@ void XmppConnection::OnStateChange(jingle_xmpp::XmppEngine::State state) { weak_xmpp_client_->GetStreamError(); ClearClient(); Delegate* delegate = delegate_; - delegate_ = NULL; + delegate_ = nullptr; delegate->OnError(error, subcode, stream_error); break; } diff --git a/chromium/jingle/notifier/listener/non_blocking_push_client_unittest.cc b/chromium/jingle/notifier/listener/non_blocking_push_client_unittest.cc index acb7e3c0140..13f7b0ee03a 100644 --- a/chromium/jingle/notifier/listener/non_blocking_push_client_unittest.cc +++ b/chromium/jingle/notifier/listener/non_blocking_push_client_unittest.cc @@ -26,7 +26,7 @@ namespace { class NonBlockingPushClientTest : public testing::Test { protected: - NonBlockingPushClientTest() : fake_push_client_(NULL) {} + NonBlockingPushClientTest() : fake_push_client_(nullptr) {} ~NonBlockingPushClientTest() override {} |