| Index: webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
|
| diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
|
| index e360d41802e71f8a1b61278e14a1a71e048f9c2d..70f68298f5df2a664ee2b02afb7e0f5a492b8811 100644
|
| --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
|
| +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
|
| @@ -40,9 +40,7 @@ ConferenceTransport::ConferenceTransport()
|
| : pq_crit_(webrtc::CriticalSectionWrapper::CreateCriticalSection()),
|
| stream_crit_(webrtc::CriticalSectionWrapper::CreateCriticalSection()),
|
| packet_event_(webrtc::EventWrapper::Create()),
|
| - thread_(webrtc::PlatformThread::CreateThread(Run,
|
| - this,
|
| - "ConferenceTransport")),
|
| + thread_(Run, this, "ConferenceTransport"),
|
| rtt_ms_(0),
|
| stream_count_(0),
|
| rtp_header_parser_(webrtc::RtpHeaderParser::Create()) {
|
| @@ -79,8 +77,8 @@ ConferenceTransport::ConferenceTransport()
|
| EXPECT_EQ(0, remote_network_->RegisterExternalTransport(reflector_, *this));
|
| EXPECT_EQ(0, remote_rtp_rtcp_->SetLocalSSRC(reflector_, kReflectorSsrc));
|
|
|
| - thread_->Start();
|
| - thread_->SetPriority(webrtc::kHighPriority);
|
| + thread_.Start();
|
| + thread_.SetPriority(rtc::kHighPriority);
|
| }
|
|
|
| ConferenceTransport::~ConferenceTransport() {
|
| @@ -93,7 +91,7 @@ ConferenceTransport::~ConferenceTransport() {
|
| RemoveStream(stream->first);
|
| }
|
|
|
| - EXPECT_TRUE(thread_->Stop());
|
| + thread_.Stop();
|
|
|
| remote_file_->Release();
|
| remote_rtp_rtcp_->Release();
|
|
|