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

Unified Diff: media/cast/net/rtcp/rtcp_builder_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc ('k') | media/cast/net/rtcp/rtcp_defines.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtcp/rtcp_builder_unittest.cc
diff --git a/media/cast/net/rtcp/rtcp_builder_unittest.cc b/media/cast/net/rtcp/rtcp_builder_unittest.cc
index c972df5057d8653e16a1a421c69f2d0c2d189883..e9ed3576b67c1540425cc06ad77b8201ecad5ce4 100644
--- a/media/cast/net/rtcp/rtcp_builder_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_builder_unittest.cc
@@ -2,18 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "media/cast/net/rtcp/rtcp_builder.h"
+
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/test/simple_test_tick_clock.h"
#include "media/cast/cast_environment.h"
#include "media/cast/net/cast_transport_config.h"
#include "media/cast/net/cast_transport_defines.h"
#include "media/cast/net/pacing/paced_sender.h"
#include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
-#include "media/cast/net/rtcp/rtcp_builder.h"
#include "media/cast/net/rtcp/rtcp_utility.h"
#include "media/cast/net/rtcp/test_rtcp_packet_builder.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -49,8 +51,7 @@ class RtcpBuilderTest : public ::testing::Test {
RtcpBuilderTest()
: rtcp_builder_(new RtcpBuilder(kSendingSsrc)) {}
- void ExpectPacketEQ(scoped_ptr<Packet> golden_packet,
- PacketRef packet) {
+ void ExpectPacketEQ(std::unique_ptr<Packet> golden_packet, PacketRef packet) {
int diffs = 0;
EXPECT_EQ(golden_packet->size(), packet->data.size());
if (golden_packet->size() == packet->data.size()) {
@@ -92,7 +93,7 @@ class RtcpBuilderTest : public ::testing::Test {
return rtcp_builder_->Finish();
}
- scoped_ptr<RtcpBuilder> rtcp_builder_;
+ std::unique_ptr<RtcpBuilder> rtcp_builder_;
DISALLOW_COPY_AND_ASSIGN(RtcpBuilderTest);
};
« no previous file with comments | « media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc ('k') | media/cast/net/rtcp/rtcp_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698