Move ownership of Transport out of Session.

remoting/protocol/ice_transport_channel.cc

Index: remoting/protocol/ice_transport_channel.cc
diff --git a/remoting/protocol/ice_transport_channel.cc b/remoting/protocol/ice_transport_channel.cc
index 61d626fe03f4921f4fef2173db00e8460416861d..7cd8431a3c715f6f9e4c30b1720ddae865a3904e 100644
--- a/remoting/protocol/ice_transport_channel.cc
+++ b/remoting/protocol/ice_transport_channel.cc
@@ -60,7 +60,7 @@ IceTransportChannel::IceTransportChannel(
 IceTransportChannel::~IceTransportChannel() {
   DCHECK(delegate_);
 
-  delegate_->OnTransportDeleted(this);
+  delegate_->OnChannelDeleted(this);
 
   auto task_runner = base::ThreadTaskRunnerHandle::Get();
   if (channel_)
@@ -102,8 +102,8 @@ void IceTransportChannel::OnPortAllocatorCreated(
   channel_->SetIceRole((transport_context_->role() == TransportRole::CLIENT)
                            ? cricket::ICEROLE_CONTROLLING
                            : cricket::ICEROLE_CONTROLLED);
-  delegate_->OnTransportIceCredentials(this, ice_username_fragment_,
-                                            ice_password);
+  delegate_->OnChannelIceCredentials(this, ice_username_fragment_,
+                                     ice_password);
   channel_->SetIceCredentials(ice_username_fragment_, ice_password);
   channel_->SignalCandidateGathered.connect(
       this, &IceTransportChannel::OnCandidateGathered);
@@ -190,7 +190,7 @@ void IceTransportChannel::OnCandidateGathered(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  delegate_->OnTransportCandidate(this, candidate);
+  delegate_->OnChannelCandidate(this, candidate);
 }
 
 void IceTransportChannel::OnRouteChange(
@@ -260,7 +260,7 @@ void IceTransportChannel::NotifyRouteChanged() {
     LOG(FATAL) << "Failed to convert local IP address.";
   }
 
-  delegate_->OnTransportRouteChange(this, route);
+  delegate_->OnChannelRouteChange(this, route);
 }
 
 void IceTransportChannel::TryReconnect() {
@@ -271,15 +271,15 @@ void IceTransportChannel::TryReconnect() {
 
     // Notify the caller that ICE connection has failed - normally that will
     // terminate Jingle connection (i.e. the transport will be destroyed).
-    delegate_->OnTransportFailed(this);
+    delegate_->OnChannelFailed(this);
     return;
   }
   --connect_attempts_left_;
 
   // Restart ICE by resetting ICE password.
   std::string ice_password = rtc::CreateRandomString(cricket::ICE_PWD_LENGTH);
-  delegate_->OnTransportIceCredentials(this, ice_username_fragment_,
-                                            ice_password);
+  delegate_->OnChannelIceCredentials(this, ice_username_fragment_,
+                                     ice_password);
   channel_->SetIceCredentials(ice_username_fragment_, ice_password);
 }