summaryrefslogtreecommitdiff
path: root/chromium/ipc/ipc_channel_proxy.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ipc/ipc_channel_proxy.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-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/ipc/ipc_channel_proxy.cc')
-rw-r--r--chromium/ipc/ipc_channel_proxy.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/ipc/ipc_channel_proxy.cc b/chromium/ipc/ipc_channel_proxy.cc
index c1d6a32cd23..e1796abc232 100644
--- a/chromium/ipc/ipc_channel_proxy.cc
+++ b/chromium/ipc/ipc_channel_proxy.cc
@@ -47,7 +47,7 @@ ChannelProxy::Context::Context(
// 2) Just use Channel
// Note, we currently make an exception for a NULL listener. That usage
// basically works, but is outside the intent of ChannelProxy. This support
- // will disappear, so please don't rely on it. See crbug.com/364241
+ // will disappear, so please don't rely on it. See https://crbug.com/364241
DCHECK(!listener ||
(ipc_task_runner_.get() != default_listener_task_runner_.get()));
}
@@ -174,7 +174,7 @@ void ChannelProxy::Context::OnAssociatedInterfaceRequest(
// Called on the IPC::Channel thread
void ChannelProxy::Context::OnChannelOpened() {
- DCHECK(channel_ != NULL);
+ DCHECK(channel_);
// Assume a reference to ourselves on behalf of this thread. This reference
// will be released when we are closed.
@@ -220,7 +220,7 @@ void ChannelProxy::Context::OnChannelClosed() {
}
void ChannelProxy::Context::Clear() {
- listener_ = NULL;
+ listener_ = nullptr;
}
// Called on the IPC::Channel thread
@@ -461,7 +461,7 @@ std::unique_ptr<ChannelProxy> ChannelProxy::Create(
ChannelProxy::ChannelProxy(Context* context)
: context_(context), did_init_(false) {
#if defined(ENABLE_IPC_FUZZER)
- outgoing_message_filter_ = NULL;
+ outgoing_message_filter_ = nullptr;
#endif
}
@@ -472,7 +472,7 @@ ChannelProxy::ChannelProxy(
: context_(new Context(listener, ipc_task_runner, listener_task_runner)),
did_init_(false) {
#if defined(ENABLE_IPC_FUZZER)
- outgoing_message_filter_ = NULL;
+ outgoing_message_filter_ = nullptr;
#endif
}