RTCMediaStreamTrackStats.kind added and collected.

webrtc/api/rtcstats_integrationtest.cc

 /*
  *  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.
  */
 
@@ skipping 411 matching lines @@
     return verifier.ExpectAllMembersSuccessfullyTested();
   }
 
   bool VerifyRTCMediaStreamTrackStats(
       const RTCMediaStreamTrackStats& media_stream_track) {
     RTCStatsVerifier verifier(report_, &media_stream_track);
     verifier.TestMemberIsDefined(media_stream_track.track_identifier);
     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);
       verifier.TestMemberIsUndefined(media_stream_track.frames_decoded);
       verifier.TestMemberIsUndefined(media_stream_track.frames_dropped);
       verifier.TestMemberIsUndefined(media_stream_track.frames_corrupted);
       verifier.TestMemberIsUndefined(media_stream_track.partial_frames_lost);
       verifier.TestMemberIsUndefined(media_stream_track.full_frames_lost);
       // Audio-only members should be undefined
       verifier.TestMemberIsUndefined(media_stream_track.audio_level);
@@ skipping 162 matching lines @@
   caller_ = nullptr;
   // Any pending stats requests should have completed in the act of destroying
   // the peer connection.
   EXPECT_TRUE(stats_obtainer->report());
 }
 #endif  // HAVE_SCTP
 
 }  // namespace
 
 }  // namespace webrtc