Moving MediaStreamSignaling logic into PeerConnection.

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 021234709dc2983af631f81db01df8db4ac18de5..b49ed29694f45552544f5868bf4596eaff01f615 100644
--- a/talk/app/webrtc/statscollector.cc
+++ b/talk/app/webrtc/statscollector.cc
@@ -30,6 +30,7 @@
 #include <utility>
 #include <vector>
 
+#include "talk/app/webrtc/peerconnection.h"
 #include "talk/session/media/channel.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/checks.h"
@@ -356,9 +357,9 @@ const char* AdapterTypeToStatsType(rtc::AdapterType type) {
   }
 }
 
-StatsCollector::StatsCollector(WebRtcSession* session)
-    : session_(session),
-      stats_gathering_started_(0) {
+StatsCollector::StatsCollector(PeerConnection* pc, WebRtcSession* session)
+    : pc_(pc), session_(session), stats_gathering_started_(0) {
+  RTC_DCHECK(pc_);
   RTC_DCHECK(session_);
 }
 
@@ -831,8 +832,7 @@ void StatsCollector::ExtractDataInfo() {
 
   rtc::Thread::ScopedDisallowBlockingCalls no_blocking_calls;
 
-  for (const auto& dc :
-           session_->mediastream_signaling()->sctp_data_channels()) {
+  for (const auto& dc : pc_->sctp_data_channels()) {
     StatsReport::Id id(StatsReport::NewTypedIntId(
         StatsReport::kStatsReportTypeDataChannel, dc->id()));
     StatsReport* report = reports_.ReplaceOrAddNew(id);