RTCIceCandidateStats added.

webrtc/api/stats/rtcstats_objects.h

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_
 #define WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_
 
 #include <string>
 
 #include "webrtc/api/stats/rtcstats.h"
 
 namespace webrtc {
 
-// https://w3c.github.io/webrtc-stats/#certificatestats-dict*
-class RTCCertificateStats : public RTCStats {
+// https://www.w3.org/TR/webrtc/#rtcicecandidatetype-enum
+struct RTCIceCandidateType {
+  static const char* kHost;
+  static const char* kSrflx;
+  static const char* kPrflx;
+  static const char* kRelay;
+};
+
+// https://w3c.github.io/webrtc-stats/#icecandidate-dict*
+class RTCIceCandidateStats : public RTCStats {
  public:
   WEBRTC_RTCSTATS_DECL();
 
+  RTCIceCandidateStats(const RTCIceCandidateStats& other);
+  ~RTCIceCandidateStats() override;
+
+  RTCStatsMember<std::string> ip;
+  RTCStatsMember<int32_t> port;
+  RTCStatsMember<std::string> protocol;
+  // TODO(hbos): Support enum types? "RTCStatsMember<RTCIceCandidateType>"?

[Taylor Brandstetter, 2016/10/06 19:09:07]

That seems like a good idea, since it's an enum in WebIDL. Even if it eventually
ends up a string, that can happen further up the Chromium stack.

[hbos, 2016/10/07 08:37:52]

Agreed. It's on my TODO-list but it turned out not to be as trivial as it
sounds.

+  RTCStatsMember<std::string> candidate_type;
+  RTCStatsMember<int32_t> priority;
+  RTCStatsMember<std::string> url;
+
+ protected:
+  RTCIceCandidateStats(const std::string& id, int64_t timestamp_us);
+  RTCIceCandidateStats(std::string&& id, int64_t timestamp_us);
+};
+
+// In the spec both local and remote varieties are of type RTCIceCandidateStats.
+// But here we define them as subclasses of |RTCIceCandidateStats| because the
+// |kType| need to be different ("RTCStatsType type") in the local/remote case.
+// https://w3c.github.io/webrtc-stats/#rtcstatstype-str*
+class RTCLocalIceCandidateStats final : public RTCIceCandidateStats {

[Taylor Brandstetter, 2016/10/06 19:09:07]

Is this just to avoid storing the "type" string multiple times? If so it seems
like a premature optimization. You could also go further and define
"RTCLocalSrflxIceCandidateStats" with a static const candidate_type, etc. But I
think it would be simpler for the stats collector to just set each field.

That said, this is just my opinion, take it or leave it.

[hbos, 2016/10/07 08:37:52]

Good point. The static variable used as a class identifier does not have to be
the same as the RTCStatsType string. I used the same variable for both because I
thought the mapping was unique in both directions and it seems to be in all
cases except for here where two string values map to the same dictionary type.
It should be addressed, but I won't do that in this CL.

+ public:
+  static const char kType[];
+  RTCLocalIceCandidateStats(const std::string& id, int64_t timestamp_us);
+  RTCLocalIceCandidateStats(std::string&& id, int64_t timestamp_us);
+  const char* type() const override;
+};
+
+class RTCRemoteIceCandidateStats final : public RTCIceCandidateStats {
+ public:
+  static const char kType[];
+  RTCRemoteIceCandidateStats(const std::string& id, int64_t timestamp_us);
+  RTCRemoteIceCandidateStats(std::string&& id, int64_t timestamp_us);
+  const char* type() const override;
+};
+
+// https://w3c.github.io/webrtc-stats/#certificatestats-dict*
+class RTCCertificateStats final : public RTCStats {
+ public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCCertificateStats(const std::string& id, int64_t timestamp_us);
   RTCCertificateStats(std::string&& id, int64_t timestamp_us);
   RTCCertificateStats(const RTCCertificateStats& other);
   ~RTCCertificateStats() override;
 
   RTCStatsMember<std::string> fingerprint;
   RTCStatsMember<std::string> fingerprint_algorithm;
   RTCStatsMember<std::string> base64_certificate;
   RTCStatsMember<std::string> issuer_certificate_id;
 };
 
 // https://w3c.github.io/webrtc-stats/#pcstats-dict*
 // TODO(hbos): Tracking bug crbug.com/636818
-class RTCPeerConnectionStats : public RTCStats {
+class RTCPeerConnectionStats final : public RTCStats {
  public:
   WEBRTC_RTCSTATS_DECL();
 
   RTCPeerConnectionStats(const std::string& id, int64_t timestamp_us);
   RTCPeerConnectionStats(std::string&& id, int64_t timestamp_us);
   RTCPeerConnectionStats(const RTCPeerConnectionStats& other);
   ~RTCPeerConnectionStats() override;
 
   RTCStatsMember<uint32_t> data_channels_opened;
   RTCStatsMember<uint32_t> data_channels_closed;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_STATS_RTCSTATS_OBJECTS_H_