OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/media/rtc_peer_connection_handler.h" | 5 #include "content/renderer/media/rtc_peer_connection_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <set> | 10 #include <set> |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 for (size_t i = 0; i < stats->membersCount(); ++i) { | 713 for (size_t i = 0; i < stats->membersCount(); ++i) { |
714 EXPECT_FALSE(stats->getMember(i)->isDefined()); | 714 EXPECT_FALSE(stats->getMember(i)->isDefined()); |
715 } | 715 } |
716 } else if (stats->id().utf8() == "RTCDefinedStats") { | 716 } else if (stats->id().utf8() == "RTCDefinedStats") { |
717 ++defined_stats_count; | 717 ++defined_stats_count; |
718 EXPECT_EQ(stats->timestamp(), 2.0); | 718 EXPECT_EQ(stats->timestamp(), 2.0); |
719 std::set<blink::WebRTCStatsMemberType> members; | 719 std::set<blink::WebRTCStatsMemberType> members; |
720 for (size_t i = 0; i < stats->membersCount(); ++i) { | 720 for (size_t i = 0; i < stats->membersCount(); ++i) { |
721 std::unique_ptr<blink::WebRTCStatsMember> member = | 721 std::unique_ptr<blink::WebRTCStatsMember> member = |
722 stats->getMember(i); | 722 stats->getMember(i); |
| 723 // TODO(hbos): A WebRTC-change is adding new members, this would cause |
| 724 // not all members to be defined. This if-statement saves Chromium from |
| 725 // crashing. As soon as the change has been rolled in, I will update |
| 726 // this test. crbug.com/627816 |
| 727 if (!member->isDefined()) |
| 728 continue; |
723 EXPECT_TRUE(member->isDefined()); | 729 EXPECT_TRUE(member->isDefined()); |
724 members.insert(member->type()); | 730 members.insert(member->type()); |
725 switch (member->type()) { | 731 switch (member->type()) { |
726 case blink::WebRTCStatsMemberTypeInt32: | 732 case blink::WebRTCStatsMemberTypeInt32: |
727 EXPECT_EQ(member->valueInt32(), static_cast<int32_t>(42)); | 733 EXPECT_EQ(member->valueInt32(), static_cast<int32_t>(42)); |
728 break; | 734 break; |
729 case blink::WebRTCStatsMemberTypeUint32: | 735 case blink::WebRTCStatsMemberTypeUint32: |
730 EXPECT_EQ(member->valueUint32(), static_cast<uint32_t>(42)); | 736 EXPECT_EQ(member->valueUint32(), static_cast<uint32_t>(42)); |
731 break; | 737 break; |
732 case blink::WebRTCStatsMemberTypeInt64: | 738 case blink::WebRTCStatsMemberTypeInt64: |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1199 testing::Ref(tracks[0]))); | 1205 testing::Ref(tracks[0]))); |
1200 | 1206 |
1201 std::unique_ptr<blink::WebRTCDTMFSenderHandler> sender( | 1207 std::unique_ptr<blink::WebRTCDTMFSenderHandler> sender( |
1202 pc_handler_->createDTMFSender(tracks[0])); | 1208 pc_handler_->createDTMFSender(tracks[0])); |
1203 EXPECT_TRUE(sender.get()); | 1209 EXPECT_TRUE(sender.get()); |
1204 | 1210 |
1205 StopAllTracks(local_stream); | 1211 StopAllTracks(local_stream); |
1206 } | 1212 } |
1207 | 1213 |
1208 } // namespace content | 1214 } // namespace content |
OLD | NEW |