diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/jingle/notifier | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 {} |