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

Unified Diff: webrtc/pc/peerconnectionendtoend_unittest.cc

Issue 2979963002: Revert of Make the default ctor of rtc::Thread, protected (Closed)
Patch Set: Created 3 years, 5 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 | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectionendtoend_unittest.cc
diff --git a/webrtc/pc/peerconnectionendtoend_unittest.cc b/webrtc/pc/peerconnectionendtoend_unittest.cc
index f7cd91f00ed6bdddc768a114053045e062d77bf6..c83235229d7cf9cc024be2602e25055dcc440f4f 100644
--- a/webrtc/pc/peerconnectionendtoend_unittest.cc
+++ b/webrtc/pc/peerconnectionendtoend_unittest.cc
@@ -54,14 +54,12 @@
DataChannelList;
PeerConnectionEndToEndTest() {
- network_thread_ = rtc::Thread::CreateWithSocketServer();
- worker_thread_ = rtc::Thread::Create();
- RTC_CHECK(network_thread_->Start());
- RTC_CHECK(worker_thread_->Start());
+ RTC_CHECK(network_thread_.Start());
+ RTC_CHECK(worker_thread_.Start());
caller_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
- "caller", network_thread_.get(), worker_thread_.get());
+ "caller", &network_thread_, &worker_thread_);
callee_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
- "callee", network_thread_.get(), worker_thread_.get());
+ "callee", &network_thread_, &worker_thread_);
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = "stun:stun.l.google.com:19302";
config_.servers.push_back(ice_server);
@@ -167,8 +165,8 @@
}
protected:
- std::unique_ptr<rtc::Thread> network_thread_;
- std::unique_ptr<rtc::Thread> worker_thread_;
+ rtc::Thread network_thread_;
+ rtc::Thread worker_thread_;
rtc::scoped_refptr<PeerConnectionTestWrapper> caller_;
rtc::scoped_refptr<PeerConnectionTestWrapper> callee_;
DataChannelList caller_signaled_data_channels_;
« no previous file with comments | « webrtc/pc/channelmanager_unittest.cc ('k') | webrtc/pc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698