Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(901)

Unified Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/message_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 310b40ea2dc6e3cc689d310e6f8f73284937a4a2..fe8a0769c25d4d1fd6eebce755e4a2e2e33c8e91 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -115,7 +115,7 @@ LibjingleTransport::LibjingleTransport(cricket::PortAllocator* port_allocator,
const NetworkSettings& network_settings)
: port_allocator_(port_allocator),
network_settings_(network_settings),
- event_handler_(NULL),
+ event_handler_(nullptr),
ice_username_fragment_(
rtc::CreateRandomString(cricket::ICE_UFRAG_LENGTH)),
ice_password_(rtc::CreateRandomString(cricket::ICE_PWD_LENGTH)),
@@ -178,7 +178,7 @@ void LibjingleTransport::DoStart() {
// Create P2PTransportChannel, attach signal handlers and connect it.
// TODO(sergeyu): Specify correct component ID for the channel.
channel_.reset(new cricket::P2PTransportChannel(
- std::string(), 0, NULL, port_allocator_));
+ std::string(), 0, nullptr, port_allocator_));
channel_->SetIceProtocolType(cricket::ICEPROTO_GOOGLE);
channel_->SetIceCredentials(ice_username_fragment_, ice_password_);
channel_->SignalRequestSignaling.connect(
« no previous file with comments | « remoting/protocol/jingle_session_unittest.cc ('k') | remoting/protocol/message_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698