zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use absl::make_unique and absl::WrapUnique directly

Browse Source 
Instead of going through our wrappers in ptr_util.h.

This CL was generated by the following script:

  git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
  git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
  git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
  git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
  git cl format

Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.

Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
This commit is contained in:
Karl Wiberg
2018-07-05 11:40:33 +02:00
committed by Commit Bot
parent 431f14ef69
commit 918f50c5d1
322 changed files with 1190 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
View File

@ -12,10 +12,10 @@
#include <memory>
#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "rtc_base/event.h"
#include "rtc_base/ptr_util.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/mock_transport.h"
@ -77,7 +77,7 @@ TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
std::unique_ptr<RtcpTransceiver> rtcp_transceiver;
queue.PostTask([&] {
rtcp_transceiver = rtc::MakeUnique<RtcpTransceiver>(config);
rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtcp_transceiver->SendCompoundPacket();
});
WaitPostedTasks(&queue);
@ -89,7 +89,7 @@ TEST(RtcpTransceiverTest, CanBeDestoryedOnTaskQueue) {
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
auto rtcp_transceiver = rtc::MakeUnique<RtcpTransceiver>(config);
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
queue.PostTask([&] { rtcp_transceiver.reset(); });
WaitPostedTasks(&queue);
@ -116,7 +116,7 @@ TEST(RtcpTransceiverTest, DoesntPostToRtcpObserverAfterCallToRemove) {
RtcpTransceiver rtcp_transceiver(config);
rtc::Event observer_deleted(false, false);
auto observer = rtc::MakeUnique<MockMediaReceiverRtcpObserver>();
auto observer = absl::make_unique<MockMediaReceiverRtcpObserver>();
EXPECT_CALL(*observer, OnSenderReport(kRemoteSsrc, _, 1));
EXPECT_CALL(*observer, OnSenderReport(kRemoteSsrc, _, 2)).Times(0);
@ -142,7 +142,7 @@ TEST(RtcpTransceiverTest, RemoveMediaReceiverRtcpObserverIsNonBlocking) {
config.outgoing_transport = &null_transport;
config.task_queue = &queue;
RtcpTransceiver rtcp_transceiver(config);
auto observer = rtc::MakeUnique<MockMediaReceiverRtcpObserver>();
auto observer = absl::make_unique<MockMediaReceiverRtcpObserver>();
rtcp_transceiver.AddMediaReceiverRtcpObserver(kRemoteSsrc, observer.get());
rtc::Event queue_blocker(false, false);
@ -199,7 +199,7 @@ TEST(RtcpTransceiverTest, DoesntSendPacketsAfterDestruction) {
EXPECT_CALL(outgoing_transport, SendRtcp(_, _)).Times(0);
auto rtcp_transceiver = rtc::MakeUnique<RtcpTransceiver>(config);
auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
rtc::Event pause(false, false);
queue.PostTask([&] {
pause.Wait(rtc::Event::kForever);