RTCMediaStreamTrackStats.kind added and collected.

webrtc/api/rtcstats_integrationtest.cc

Index: webrtc/api/rtcstats_integrationtest.cc
diff --git a/webrtc/api/rtcstats_integrationtest.cc b/webrtc/api/rtcstats_integrationtest.cc
index 7a67038ef96e4bdaabe343eba20f4ea56899db8c..98eafb0ac319fc3b874979568f526b290263fd94 100644
--- a/webrtc/api/rtcstats_integrationtest.cc
+++ b/webrtc/api/rtcstats_integrationtest.cc
@@ -429,13 +429,21 @@ class RTCStatsReportVerifier {
     verifier.TestMemberIsDefined(media_stream_track.remote_source);
     verifier.TestMemberIsDefined(media_stream_track.ended);
     verifier.TestMemberIsDefined(media_stream_track.detached);
+    verifier.TestMemberIsDefined(media_stream_track.kind);
     // Video or audio media stream track?
-    if (media_stream_track.frame_width.is_defined()) {
+    if (*media_stream_track.kind == RTCMediaStreamTrackKind::kVideo) {
       // Video-only members
-      verifier.TestMemberIsNonNegative<uint32_t>(
-          media_stream_track.frame_width);
-      verifier.TestMemberIsNonNegative<uint32_t>(
-          media_stream_track.frame_height);
+      if (!*media_stream_track.remote_source) {
+        verifier.TestMemberIsNonNegative<uint32_t>(
+            media_stream_track.frame_width);
+        verifier.TestMemberIsNonNegative<uint32_t>(
+            media_stream_track.frame_height);
+      } else {
+        // TODO(hbos): Frame width/height should be defined for the remote case.
+        // Is this a real problem or an artifact of testing? crbug.com/659137

[hbos, 2017/01/16 22:15:40]

This CL uncovered this bug, it was not caused by this CL.

+        verifier.TestMemberIsUndefined(media_stream_track.frame_width);
+        verifier.TestMemberIsUndefined(media_stream_track.frame_height);
+      }
       verifier.TestMemberIsUndefined(media_stream_track.frames_per_second);
       verifier.TestMemberIsUndefined(media_stream_track.frames_sent);
       verifier.TestMemberIsUndefined(media_stream_track.frames_received);