TransportController refactoring

talk/app/webrtc/statscollector.cc

Index: talk/app/webrtc/statscollector.cc
diff --git a/talk/app/webrtc/statscollector.cc b/talk/app/webrtc/statscollector.cc
index ad64639eb93a18f04295499712163f49331080af..6d167ac22963944c833fcfd6bd45278fa602123a 100644
--- a/talk/app/webrtc/statscollector.cc
+++ b/talk/app/webrtc/statscollector.cc
@@ -692,24 +692,18 @@ void StatsCollector::ExtractSessionInfo() {
     // expose them in stats reports.  All channels in a transport share the
     // same local and remote certificates.
     //
-    // Note that Transport::GetIdentity and Transport::GetRemoteCertificate
-    // invoke method calls on the worker thread and block this thread, but
-    // messages are still processed on this thread, which may blow way the
-    // existing transports. So we cannot reuse |transport| after these calls.
     StatsReport::Id local_cert_report_id, remote_cert_report_id;
-
-    cricket::Transport* transport =
-        session_->GetTransport(transport_iter.second.content_name);
     rtc::scoped_ptr<rtc::SSLIdentity> identity;
-    if (transport && transport->GetIdentity(identity.accept())) {
+    if (session_->GetIdentity(transport_iter.second.content_name,
+                              identity.accept())) {
       StatsReport* r = AddCertificateReports(&(identity->certificate()));
       if (r)
         local_cert_report_id = r->id();
     }
 
-    transport = session_->GetTransport(transport_iter.second.content_name);
     rtc::scoped_ptr<rtc::SSLCertificate> cert;
-    if (transport && transport->GetRemoteCertificate(cert.accept())) {
+    if (session_->GetRemoteCertificate(transport_iter.second.content_name,
+                                       cert.accept())) {

[pthatcher1, 2015/08/10 20:40:16]

Would it make more sense for GetIdentity and GetRemoteCertificate to be on the
TransportController?

[Taylor Brandstetter, 2015/08/11 01:20:06]

They ARE methods on the TransportController. But the thing is, WebRtcSession
needs to map a content name to a transport name. Also, WebRtcSession doesn't
directly expose the TransportController interface to StatsCollector.

[pthatcher1, 2015/08/18 22:32:46]

Ah, so the transport_iter.second.content_name is the content name, not the
transport name, and the proxy_to_transport_ (now misnamed) converts from
content_name to the transport_name.  

That all seems like a big mess, but it looks like you're retaining the existing
behavior in a clean way.  We'll have to shave the stats yak another time.

       StatsReport* r = AddCertificateReports(cert.get());
       if (r)
         remote_cert_report_id = r->id();
@@ -934,7 +928,6 @@ void StatsCollector::UpdateTrackReports() {
     StatsReport* report = entry.second;
     report->set_timestamp(stats_gathering_started_);
   }
-
 }
 
 void StatsCollector::ClearUpdateStatsCacheForTest() {