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

Side by Side Diff: media/cast/net/rtcp/rtcp_unittest.cc

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « media/cast/net/rtcp/rtcp_defines.h ('k') | media/cast/net/rtcp/rtcp_utility_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 builder.AddCast(*cast_message, target_delay); 177 builder.AddCast(*cast_message, target_delay);
178 if (pli_message) 178 if (pli_message)
179 builder.AddPli(*pli_message); 179 builder.AddPli(*pli_message);
180 if (rtcp_events) 180 if (rtcp_events)
181 builder.AddReceiverLog(*rtcp_events); 181 builder.AddReceiverLog(*rtcp_events);
182 return builder.Finish(); 182 return builder.Finish();
183 } 183 }
184 184
185 void OnReceivedPli() { received_pli_ = true; } 185 void OnReceivedPli() { received_pli_ = true; }
186 186
187 scoped_ptr<base::SimpleTestTickClock> sender_clock_; 187 std::unique_ptr<base::SimpleTestTickClock> sender_clock_;
188 scoped_ptr<test::SkewedTickClock> receiver_clock_; 188 std::unique_ptr<test::SkewedTickClock> receiver_clock_;
189 FakeRtcpTransport rtp_sender_pacer_; 189 FakeRtcpTransport rtp_sender_pacer_;
190 FakeRtcpTransport rtp_receiver_pacer_; 190 FakeRtcpTransport rtp_receiver_pacer_;
191 SenderRtcpSession rtcp_at_rtp_sender_; 191 SenderRtcpSession rtcp_at_rtp_sender_;
192 ReceiverRtcpSession rtcp_at_rtp_receiver_; 192 ReceiverRtcpSession rtcp_at_rtp_receiver_;
193 193
194 base::TimeDelta current_round_trip_time_; 194 base::TimeDelta current_round_trip_time_;
195 RtcpCastMessage last_cast_message_; 195 RtcpCastMessage last_cast_message_;
196 RtcpReceiverLogMessage last_logs_; 196 RtcpReceiverLogMessage last_logs_;
197 bool received_pli_; 197 bool received_pli_;
198 198
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 // Only 24 bits of event timestamp sent on wire. 369 // Only 24 bits of event timestamp sent on wire.
370 uint32_t event_ts = 370 uint32_t event_ts =
371 (event.timestamp - base::TimeTicks()).InMilliseconds() & 0xffffff; 371 (event.timestamp - base::TimeTicks()).InMilliseconds() & 0xffffff;
372 uint32_t log_msg_ts = 372 uint32_t log_msg_ts =
373 (log_msg.event_timestamp - base::TimeTicks()).InMilliseconds() & 0xffffff; 373 (log_msg.event_timestamp - base::TimeTicks()).InMilliseconds() & 0xffffff;
374 EXPECT_EQ(log_msg_ts, event_ts); 374 EXPECT_EQ(log_msg_ts, event_ts);
375 } 375 }
376 376
377 } // namespace cast 377 } // namespace cast
378 } // namespace media 378 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtcp/rtcp_defines.h ('k') | media/cast/net/rtcp/rtcp_utility_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698