| Index: remoting/protocol/channel_dispatcher_base.cc
|
| diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc
|
| index 945f5e2f71b32f9b070cf4d4a909d519f8c4a469..0209cc27063766888e99d621e330ca27b2a36d73 100644
|
| --- a/remoting/protocol/channel_dispatcher_base.cc
|
| +++ b/remoting/protocol/channel_dispatcher_base.cc
|
| @@ -15,7 +15,7 @@ namespace protocol {
|
|
|
| ChannelDispatcherBase::ChannelDispatcherBase(const char* channel_name)
|
| : channel_name_(channel_name),
|
| - channel_factory_(NULL) {
|
| + channel_factory_(nullptr) {
|
| }
|
|
|
| ChannelDispatcherBase::~ChannelDispatcherBase() {
|
| @@ -55,7 +55,7 @@ void ChannelDispatcherBase::OnChannelReady(
|
| return;
|
| }
|
|
|
| - channel_factory_ = NULL;
|
| + channel_factory_ = nullptr;
|
| channel_ = socket.Pass();
|
|
|
| OnInitialized();
|
|
|