RTCTransportStats added.

webrtc/stats/rtcstats_objects.cc

Index: webrtc/stats/rtcstats_objects.cc
diff --git a/webrtc/stats/rtcstats_objects.cc b/webrtc/stats/rtcstats_objects.cc
index 3d82d09e4a4ad1eff57acd390b48e531bccb4709..6a4203ed0eb1682478351fa02d26d5610ecca4a8 100644
--- a/webrtc/stats/rtcstats_objects.cc
+++ b/webrtc/stats/rtcstats_objects.cc
@@ -30,6 +30,82 @@ const char* RTCIceCandidateType::kSrflx = "srflx";
 const char* RTCIceCandidateType::kPrflx = "prflx";
 const char* RTCIceCandidateType::kRelay = "relay";
 
+WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate",
+    &fingerprint,
+    &fingerprint_algorithm,
+    &base64_certificate,
+    &issuer_certificate_id);
+
+RTCCertificateStats::RTCCertificateStats(
+    const std::string& id, int64_t timestamp_us)
+    : RTCCertificateStats(std::string(id), timestamp_us) {
+}
+
+RTCCertificateStats::RTCCertificateStats(
+    std::string&& id, int64_t timestamp_us)
+    : RTCStats(std::move(id), timestamp_us),
+      fingerprint("fingerprint"),
+      fingerprint_algorithm("fingerprintAlgorithm"),
+      base64_certificate("base64Certificate"),
+      issuer_certificate_id("issuerCertificateId") {
+}
+
+RTCCertificateStats::RTCCertificateStats(
+    const RTCCertificateStats& other)
+    : RTCStats(other.id(), other.timestamp_us()),
+      fingerprint(other.fingerprint),
+      fingerprint_algorithm(other.fingerprint_algorithm),
+      base64_certificate(other.base64_certificate),
+      issuer_certificate_id(other.issuer_certificate_id) {
+}
+
+RTCCertificateStats::~RTCCertificateStats() {
+}
+
+WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel",
+    &label,
+    &protocol,
+    &datachannelid,
+    &state,
+    &messages_sent,
+    &bytes_sent,
+    &messages_received,
+    &bytes_received);
+
+RTCDataChannelStats::RTCDataChannelStats(
+    const std::string& id, int64_t timestamp_us)
+    : RTCDataChannelStats(std::string(id), timestamp_us) {
+}
+
+RTCDataChannelStats::RTCDataChannelStats(
+    std::string&& id, int64_t timestamp_us)
+    : RTCStats(std::move(id), timestamp_us),
+      label("label"),
+      protocol("protocol"),
+      datachannelid("datachannelid"),
+      state("state"),
+      messages_sent("messagesSent"),
+      bytes_sent("bytesSent"),
+      messages_received("messagesReceived"),
+      bytes_received("bytesReceived") {
+}
+
+RTCDataChannelStats::RTCDataChannelStats(
+    const RTCDataChannelStats& other)
+    : RTCStats(other.id(), other.timestamp_us()),
+      label(other.label),
+      protocol(other.protocol),
+      datachannelid(other.datachannelid),
+      state(other.state),
+      messages_sent(other.messages_sent),
+      bytes_sent(other.bytes_sent),
+      messages_received(other.messages_received),
+      bytes_received(other.bytes_received) {
+}
+
+RTCDataChannelStats::~RTCDataChannelStats() {
+}
+
 WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair",
     &transport_id,
     &local_candidate_id,
@@ -191,106 +267,71 @@ const char* RTCRemoteIceCandidateStats::type() const {
   return kType;
 }
 
-WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate",
-    &fingerprint,
-    &fingerprint_algorithm,
-    &base64_certificate,
-    &issuer_certificate_id);
+WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection",
+    &data_channels_opened,
+    &data_channels_closed);
 
-RTCCertificateStats::RTCCertificateStats(
+RTCPeerConnectionStats::RTCPeerConnectionStats(
     const std::string& id, int64_t timestamp_us)
-    : RTCCertificateStats(std::string(id), timestamp_us) {
+    : RTCPeerConnectionStats(std::string(id), timestamp_us) {
 }
 
-RTCCertificateStats::RTCCertificateStats(
+RTCPeerConnectionStats::RTCPeerConnectionStats(
     std::string&& id, int64_t timestamp_us)
     : RTCStats(std::move(id), timestamp_us),
-      fingerprint("fingerprint"),
-      fingerprint_algorithm("fingerprintAlgorithm"),
-      base64_certificate("base64Certificate"),
-      issuer_certificate_id("issuerCertificateId") {
+      data_channels_opened("dataChannelsOpened"),
+      data_channels_closed("dataChannelsClosed") {
 }
 
-RTCCertificateStats::RTCCertificateStats(
-    const RTCCertificateStats& other)
+RTCPeerConnectionStats::RTCPeerConnectionStats(
+    const RTCPeerConnectionStats& other)
     : RTCStats(other.id(), other.timestamp_us()),
-      fingerprint(other.fingerprint),
-      fingerprint_algorithm(other.fingerprint_algorithm),
-      base64_certificate(other.base64_certificate),
-      issuer_certificate_id(other.issuer_certificate_id) {
+      data_channels_opened(other.data_channels_opened),
+      data_channels_closed(other.data_channels_closed) {
 }
 
-RTCCertificateStats::~RTCCertificateStats() {
+RTCPeerConnectionStats::~RTCPeerConnectionStats() {
 }
 
-WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel",
-    &label,
-    &protocol,
-    &datachannelid,
-    &state,
-    &messages_sent,
+WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport",
     &bytes_sent,
-    &messages_received,
-    &bytes_received);
+    &bytes_received,
+    &rtcp_transport_stats_id,
+    &active_connection,
+    &selected_candidate_pair_id,
+    &local_certificate_id,
+    &remote_certificate_id);
 
-RTCDataChannelStats::RTCDataChannelStats(
+RTCTransportStats::RTCTransportStats(
     const std::string& id, int64_t timestamp_us)
-    : RTCDataChannelStats(std::string(id), timestamp_us) {
+    : RTCTransportStats(std::string(id), timestamp_us) {
 }
 
-RTCDataChannelStats::RTCDataChannelStats(
+RTCTransportStats::RTCTransportStats(
     std::string&& id, int64_t timestamp_us)
     : RTCStats(std::move(id), timestamp_us),
-      label("label"),
-      protocol("protocol"),
-      datachannelid("datachannelid"),
-      state("state"),
-      messages_sent("messagesSent"),
       bytes_sent("bytesSent"),
-      messages_received("messagesReceived"),
-      bytes_received("bytesReceived") {
+      bytes_received("bytesReceived"),
+      rtcp_transport_stats_id("rtcpTransportStatsId"),
+      active_connection("activeConnection"),
+      selected_candidate_pair_id("selectedCandidatePairId"),
+      local_certificate_id("localCertificateId"),
+      remote_certificate_id("remoteCertificateId") {
 }
 
-RTCDataChannelStats::RTCDataChannelStats(
-    const RTCDataChannelStats& other)
+RTCTransportStats::RTCTransportStats(
+    const RTCTransportStats& other)
     : RTCStats(other.id(), other.timestamp_us()),
-      label(other.label),
-      protocol(other.protocol),
-      datachannelid(other.datachannelid),
-      state(other.state),
-      messages_sent(other.messages_sent),
       bytes_sent(other.bytes_sent),
-      messages_received(other.messages_received),
-      bytes_received(other.bytes_received) {
-}
-
-RTCDataChannelStats::~RTCDataChannelStats() {
-}
-
-WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection",
-    &data_channels_opened,
-    &data_channels_closed);
-
-RTCPeerConnectionStats::RTCPeerConnectionStats(
-    const std::string& id, int64_t timestamp_us)
-    : RTCPeerConnectionStats(std::string(id), timestamp_us) {
-}
-
-RTCPeerConnectionStats::RTCPeerConnectionStats(
-    std::string&& id, int64_t timestamp_us)
-    : RTCStats(std::move(id), timestamp_us),
-      data_channels_opened("dataChannelsOpened"),
-      data_channels_closed("dataChannelsClosed") {
-}
-
-RTCPeerConnectionStats::RTCPeerConnectionStats(
-    const RTCPeerConnectionStats& other)
-    : RTCStats(other.id(), other.timestamp_us()),
-      data_channels_opened(other.data_channels_opened),
-      data_channels_closed(other.data_channels_closed) {
+      bytes_received(other.bytes_received),
+      rtcp_transport_stats_id(other.rtcp_transport_stats_id),
+      active_connection(other.active_connection),
+      selected_candidate_pair_id(other.selected_candidate_pair_id),
+      local_certificate_id(other.local_certificate_id),
+      remote_certificate_id(other.remote_certificate_id) {
 }
 
-RTCPeerConnectionStats::~RTCPeerConnectionStats() {
+RTCTransportStats::~RTCTransportStats() {
 }
 
 }  // namespace webrtc