Index: remoting/host/desktop_session_proxy.cc |
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc |
index ec163ca4fb491ac60615ee6e94daf872fb475e91..cb928dd4fd1f910363f56fb7ecf37d880963c831 100644 |
--- a/remoting/host/desktop_session_proxy.cc |
+++ b/remoting/host/desktop_session_proxy.cc |
@@ -448,7 +448,7 @@ DesktopSessionProxy::GetSharedBufferCore(int id) { |
return i->second; |
} else { |
LOG(ERROR) << "Failed to find the shared buffer " << id; |
- return NULL; |
+ return nullptr; |
} |
} |
@@ -478,7 +478,7 @@ void DesktopSessionProxy::OnCreateSharedBuffer( |
scoped_refptr<IpcSharedBufferCore> shared_buffer = |
new IpcSharedBufferCore(id, handle, desktop_process_, size); |
- if (shared_buffer->memory() != NULL && |
+ if (shared_buffer->memory() != nullptr && |
!shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) { |
LOG(ERROR) << "Duplicate shared buffer id " << id << " encountered"; |
} |