TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 14:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delete implicit conversion from raw pointer to rtc::scoped_refptr.

Browse Source 
See bugs.webrtc.org/13464 for context.

PiperOrigin-RevId: 424019378
This commit is contained in:
hai007
2022-02-02 11:38:02 -08:00
parent 1b0efd13ef
commit 71292b991b
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/mediums/webrtc/connection_flow.cc
+8 -8
View File
@@ -171,10 +171,10 @@ void ConnectionFlow::CreateOfferOnSignalingThread(
pc->CreateDataChannel(kDataChannelName, &data_channel_init));
webrtc::PeerConnectionInterface::RTCOfferAnswerOptions options;
rtc::scoped_refptr<CreateSessionDescriptionObserverImpl> observer =
rtc::scoped_refptr<CreateSessionDescriptionObserverImpl> observer(
new rtc::RefCountedObject<CreateSessionDescriptionObserverImpl>(
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<CreateSessionDescriptionObserverImpl> observer =
rtc::scoped_refptr<CreateSessionDescriptionObserverImpl> observer(
new rtc::RefCountedObject<CreateSessionDescriptionObserverImpl>(
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<SetLocalDescriptionObserver> observer =
new rtc::RefCountedObject<SetLocalDescriptionObserver>();
rtc::scoped_refptr<SetLocalDescriptionObserver> observer(
new rtc::RefCountedObject<SetLocalDescriptionObserver>());
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<SetRemoteDescriptionObserver> observer =
new rtc::RefCountedObject<SetRemoteDescriptionObserver>();
rtc::scoped_refptr<SetRemoteDescriptionObserver> observer(
new rtc::RefCountedObject<SetRemoteDescriptionObserver>());
if (!RunOnSignalingThread([this, observer, sdp = std::move(sdp),
expected_entry_state, exit_state]() mutable {
cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc
+11 -11
View File
@@ -60,7 +60,7 @@ class MockDataChannel
TEST(WebRtcSocketTest, ReadFromSocket) {
const char* message = "message";
rtc::scoped_refptr<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> 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<MockDataChannel> mock_data_channel = new MockDataChannel();
rtc::scoped_refptr<MockDataChannel> mock_data_channel(new MockDataChannel());
WebRtcSocket webrtc_socket(kSocketName, mock_data_channel);
int socket_closed_cb_called = 0;