Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: media/cast/rtcp/rtcp_sender_unittest.cc

Issue 145443005: Fixes for memory and threading issues in cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/cast/rtcp/rtcp_sender.cc ('k') | media/cast/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/test/simple_test_tick_clock.h" 6 #include "base/test/simple_test_tick_clock.h"
7 #include "media/cast/cast_defines.h" 7 #include "media/cast/cast_defines.h"
8 #include "media/cast/cast_environment.h" 8 #include "media/cast/cast_environment.h"
9 #include "media/cast/rtcp/rtcp_sender.h" 9 #include "media/cast/rtcp/rtcp_sender.h"
10 #include "media/cast/rtcp/rtcp_utility.h" 10 #include "media/cast/rtcp/rtcp_utility.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 private: 55 private:
56 uint8 expected_packet_[kMaxIpPacketSize]; 56 uint8 expected_packet_[kMaxIpPacketSize];
57 size_t expected_packet_length_; 57 size_t expected_packet_length_;
58 int packet_count_; 58 int packet_count_;
59 }; 59 };
60 60
61 class RtcpSenderTest : public ::testing::Test { 61 class RtcpSenderTest : public ::testing::Test {
62 protected: 62 protected:
63 RtcpSenderTest() 63 RtcpSenderTest()
64 : task_runner_(new test::FakeTaskRunner(&testing_clock_)), 64 : testing_clock_(new base::SimpleTestTickClock()),
65 cast_environment_(new CastEnvironment(&testing_clock_, task_runner_, 65 task_runner_(new test::FakeTaskRunner(testing_clock_)),
66 cast_environment_(new CastEnvironment(
67 scoped_ptr<base::TickClock>(testing_clock_).Pass(),
66 task_runner_, task_runner_, task_runner_, task_runner_, 68 task_runner_, task_runner_, task_runner_, task_runner_,
67 task_runner_, GetDefaultCastSenderLoggingConfig())), 69 task_runner_, task_runner_, GetDefaultCastSenderLoggingConfig())),
68 rtcp_sender_(new RtcpSender(cast_environment_, 70 rtcp_sender_(new RtcpSender(cast_environment_,
69 &test_transport_, 71 &test_transport_,
70 kSendingSsrc, 72 kSendingSsrc,
71 kCName)) { 73 kCName)) {
72 } 74 }
73 75
74 base::SimpleTestTickClock testing_clock_; 76 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
75 TestRtcpTransport test_transport_; 77 TestRtcpTransport test_transport_;
76 scoped_refptr<test::FakeTaskRunner> task_runner_; 78 scoped_refptr<test::FakeTaskRunner> task_runner_;
77 scoped_refptr<CastEnvironment> cast_environment_; 79 scoped_refptr<CastEnvironment> cast_environment_;
78 scoped_ptr<RtcpSender> rtcp_sender_; 80 scoped_ptr<RtcpSender> rtcp_sender_;
79 }; 81 };
80 82
81 TEST_F(RtcpSenderTest, RtcpReceiverReport) { 83 TEST_F(RtcpSenderTest, RtcpReceiverReport) {
82 // Empty receiver report + c_name. 84 // Empty receiver report + c_name.
83 TestRtcpPacketBuilder p1; 85 TestRtcpPacketBuilder p1;
84 p1.AddRr(kSendingSsrc, 0); 86 p1.AddRr(kSendingSsrc, 0);
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 NULL, 452 NULL,
451 NULL, 453 NULL,
452 &receiver_log); 454 &receiver_log);
453 455
454 EXPECT_EQ(1, test_transport_.packet_count()); 456 EXPECT_EQ(1, test_transport_.packet_count());
455 EXPECT_EQ(81u, receiver_log.size()); 457 EXPECT_EQ(81u, receiver_log.size());
456 } 458 }
457 459
458 } // namespace cast 460 } // namespace cast
459 } // namespace media 461 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/rtcp/rtcp_sender.cc ('k') | media/cast/rtcp/rtcp_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698