Revert of TransportController refactoring.

talk/app/webrtc/statscollector.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 679 matching lines @@
   // the proxy map directly from the session stats.
   // As is, if GetStats() failed, we could be using old (incorrect?) proxy
   // data.
   proxy_to_transport_ = stats.proxy_to_transport;
 
   for (const auto& transport_iter : stats.transport_stats) {
     // Attempt to get a copy of the certificates from the transport and
     // expose them in stats reports.  All channels in a transport share the
     // same local and remote certificates.
     //
+    // Note that Transport::GetCertificate 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_refptr<rtc::RTCCertificate> certificate;
-    if (session_->GetLocalCertificate(transport_iter.second.transport_name,
-                                      &certificate)) {
+    if (transport && transport->GetCertificate(&certificate)) {
       StatsReport* r = AddCertificateReports(&(certificate->ssl_certificate()));
       if (r)
         local_cert_report_id = r->id();
     }
 
+    transport = session_->GetTransport(transport_iter.second.content_name);
     rtc::scoped_ptr<rtc::SSLCertificate> cert;
-    if (session_->GetRemoteSSLCertificate(transport_iter.second.transport_name,
-                                          cert.accept())) {
+    if (transport && transport->GetRemoteSSLCertificate(cert.accept())) {
       StatsReport* r = AddCertificateReports(cert.get());
       if (r)
         remote_cert_report_id = r->id();
     }
 
     for (const auto& channel_iter : transport_iter.second.channel_stats) {
       StatsReport::Id id(StatsReport::NewComponentId(
-          transport_iter.second.transport_name, channel_iter.component));
+          transport_iter.second.content_name, channel_iter.component));
       StatsReport* channel_report = reports_.ReplaceOrAddNew(id);
       channel_report->set_timestamp(stats_gathering_started_);
       channel_report->AddInt(StatsReport::kStatsValueNameComponent,
                              channel_iter.component);
       if (local_cert_report_id.get()) {
         channel_report->AddId(StatsReport::kStatsValueNameLocalCertificateId,
                               local_cert_report_id);
       }
       if (remote_cert_report_id.get()) {
         channel_report->AddId(StatsReport::kStatsValueNameRemoteCertificateId,
@@ skipping 196 matching lines @@
 
 void StatsCollector::UpdateTrackReports() {
   RTC_DCHECK(session_->signaling_thread()->IsCurrent());
 
   rtc::Thread::ScopedDisallowBlockingCalls no_blocking_calls;
 
   for (const auto& entry : track_ids_) {
     StatsReport* report = entry.second;
     report->set_timestamp(stats_gathering_started_);
   }
+
 }
 
 void StatsCollector::ClearUpdateStatsCacheForTest() {
   stats_gathering_started_ = 0;
 }
 
 }  // namespace webrtc