| Index: remoting/protocol/fake_datagram_socket.cc
|
| diff --git a/remoting/protocol/fake_datagram_socket.cc b/remoting/protocol/fake_datagram_socket.cc
|
| index daf6a4be56e5fdcc87737cea7468894fbc96464d..75a50b39a74af4b0b4c315443877a0c7c683168a 100644
|
| --- a/remoting/protocol/fake_datagram_socket.cc
|
| +++ b/remoting/protocol/fake_datagram_socket.cc
|
| @@ -34,7 +34,7 @@ void FakeDatagramSocket::AppendInputPacket(const std::string& data) {
|
| if (!read_callback_.is_null()) {
|
| DCHECK_EQ(input_pos_, static_cast<int>(input_packets_.size()) - 1);
|
| int result = CopyReadData(read_buffer_.get(), read_buffer_size_);
|
| - read_buffer_ = NULL;
|
| + read_buffer_ = nullptr;
|
|
|
| net::CompletionCallback callback = read_callback_;
|
| read_callback_.Reset();
|
| @@ -110,7 +110,7 @@ FakeDatagramChannelFactory::FakeDatagramChannelFactory()
|
| FakeDatagramChannelFactory::~FakeDatagramChannelFactory() {
|
| for (ChannelsMap::iterator it = channels_.begin(); it != channels_.end();
|
| ++it) {
|
| - EXPECT_TRUE(it->second == NULL);
|
| + EXPECT_TRUE(it->second == nullptr);
|
| }
|
| }
|
|
|
| @@ -128,7 +128,7 @@ FakeDatagramSocket* FakeDatagramChannelFactory::GetFakeChannel(
|
| void FakeDatagramChannelFactory::CreateChannel(
|
| const std::string& name,
|
| const ChannelCreatedCallback& callback) {
|
| - EXPECT_TRUE(channels_[name] == NULL);
|
| + EXPECT_TRUE(channels_[name] == nullptr);
|
|
|
| scoped_ptr<FakeDatagramSocket> channel(new FakeDatagramSocket());
|
| channels_[name] = channel->GetWeakPtr();
|
|
|