From 71292b991bdaaeade081ddb1a1bb7f8c62c23b92 Mon Sep 17 00:00:00 2001 From: hai007 Date: Tue, 25 Jan 2022 01:31:12 -0800 Subject: [PATCH] Delete implicit conversion from raw pointer to rtc::scoped_refptr. See bugs.webrtc.org/13464 for context. PiperOrigin-RevId: 424019378 --- .../mediums/webrtc/connection_flow.cc | 16 +++++++------- .../mediums/webrtc/webrtc_socket_impl_test.cc | 22 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cpp/core/internal/mediums/webrtc/connection_flow.cc b/cpp/core/internal/mediums/webrtc/connection_flow.cc index 78efab68..ab4ec9b8 100644 --- a/cpp/core/internal/mediums/webrtc/connection_flow.cc +++ b/cpp/core/internal/mediums/webrtc/connection_flow.cc @@ -171,10 +171,10 @@ void ConnectionFlow::CreateOfferOnSignalingThread( pc->CreateDataChannel(kDataChannelName, &data_channel_init)); webrtc::PeerConnectionInterface::RTCOfferAnswerOptions options; - rtc::scoped_refptr observer = + rtc::scoped_refptr observer( new rtc::RefCountedObject( this, success_future, State::kCreatingOffer, - State::kWaitingForAnswer); + State::kWaitingForAnswer)); pc->CreateOffer(observer, options); } @@ -202,10 +202,10 @@ void ConnectionFlow::CreateAnswerOnSignalingThread( return; } webrtc::PeerConnectionInterface::RTCOfferAnswerOptions options; - rtc::scoped_refptr observer = + rtc::scoped_refptr observer( new rtc::RefCountedObject( this, success_future, State::kCreatingAnswer, - State::kWaitingToConnect); + State::kWaitingToConnect)); auto pc = GetPeerConnection(); pc->CreateAnswer(observer, options); } @@ -214,8 +214,8 @@ bool ConnectionFlow::SetLocalSessionDescription(SessionDescriptionWrapper sdp) { CHECK(!IsRunningOnSignalingThread()); if (!sdp.IsValid()) return false; - rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + rtc::scoped_refptr observer( + new rtc::RefCountedObject()); if (!RunOnSignalingThread([this, observer, sdp = std::move(sdp)]() mutable { if (state_ == State::kEnded) { @@ -246,8 +246,8 @@ bool ConnectionFlow::SetRemoteSessionDescription(SessionDescriptionWrapper sdp, State exit_state) { if (!sdp.IsValid()) return false; - rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + rtc::scoped_refptr observer( + new rtc::RefCountedObject()); if (!RunOnSignalingThread([this, observer, sdp = std::move(sdp), expected_entry_state, exit_state]() mutable { diff --git a/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc b/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc index 95487f3e..f1b9ca9a 100644 --- a/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc +++ b/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc @@ -60,7 +60,7 @@ class MockDataChannel TEST(WebRtcSocketTest, ReadFromSocket) { const char* message = "message"; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); webrtc_socket.OnMessage(webrtc::DataBuffer{message}); @@ -70,7 +70,7 @@ TEST(WebRtcSocketTest, ReadFromSocket) { } TEST(WebRtcSocketTest, ReadMultipleMessages) { - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); webrtc_socket.OnMessage(webrtc::DataBuffer{"Me"}); @@ -95,7 +95,7 @@ TEST(WebRtcSocketTest, ReadMultipleMessages) { TEST(WebRtcSocketTest, WriteToSocket) { const ByteArray kMessage{"Message"}; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); EXPECT_CALL(*mock_data_channel, Send(testing::_)) @@ -105,7 +105,7 @@ TEST(WebRtcSocketTest, WriteToSocket) { TEST(WebRtcSocketTest, SendDataBiggerThanMax) { const ByteArray kMessage{kMaxDataSize + 1}; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); EXPECT_CALL(*mock_data_channel, Send(testing::_)).Times(0); @@ -115,7 +115,7 @@ TEST(WebRtcSocketTest, SendDataBiggerThanMax) { TEST(WebRtcSocketTest, WriteToDataChannelFails) { ByteArray kMessage{"Message"}; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); ON_CALL(*mock_data_channel, Send(testing::_)) @@ -125,7 +125,7 @@ TEST(WebRtcSocketTest, WriteToDataChannelFails) { } TEST(WebRtcSocketTest, Close) { - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); EXPECT_CALL(*mock_data_channel, Close()); @@ -150,7 +150,7 @@ TEST(WebRtcSocketTest, Close) { TEST(WebRtcSocketTest, WriteOnClosedChannel) { ByteArray kMessage{"Message"}; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); webrtc_socket.Close(); @@ -161,7 +161,7 @@ TEST(WebRtcSocketTest, WriteOnClosedChannel) { TEST(WebRtcSocketTest, ReadFromClosedChannel) { ByteArray kMessage{"Message"}; - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); ON_CALL(*mock_data_channel, Send(testing::_)) .WillByDefault(testing::Return(true)); @@ -173,7 +173,7 @@ TEST(WebRtcSocketTest, ReadFromClosedChannel) { } TEST(WebRtcSocketTest, DataChannelCloseEventCleansUp) { - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); ON_CALL(*mock_data_channel, state()) @@ -190,7 +190,7 @@ TEST(WebRtcSocketTest, DataChannelCloseEventCleansUp) { } TEST(WebRtcSocketTest, OpenStateTriggersCallback) { - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); int socket_ready_cb_called = 0; @@ -210,7 +210,7 @@ TEST(WebRtcSocketTest, OpenStateTriggersCallback) { } TEST(WebRtcSocketTest, CloseStateTriggersCallback) { - rtc::scoped_refptr mock_data_channel = new MockDataChannel(); + rtc::scoped_refptr mock_data_channel(new MockDataChannel()); WebRtcSocket webrtc_socket(kSocketName, mock_data_channel); int socket_closed_cb_called = 0;