diff options
Diffstat (limited to 'webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h')
-rw-r--r-- | webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h index 1a1075c585..116ff0aec3 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h @@ -13,6 +13,7 @@ #include <deque> +#include "webrtc/base/platform_thread.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" @@ -20,7 +21,6 @@ #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" class TestErrorObserver; @@ -30,16 +30,14 @@ class LoopBackTransport : public webrtc::Transport { LoopBackTransport(webrtc::VoENetwork* voe_network, int channel) : crit_(webrtc::CriticalSectionWrapper::CreateCriticalSection()), packet_event_(webrtc::EventWrapper::Create()), - thread_(webrtc::ThreadWrapper::CreateThread(NetworkProcess, - this, - "LoopBackTransport")), + thread_(NetworkProcess, this, "LoopBackTransport"), channel_(channel), voe_network_(voe_network), transmitted_packets_(0) { - thread_->Start(); + thread_.Start(); } - ~LoopBackTransport() { thread_->Stop(); } + ~LoopBackTransport() { thread_.Stop(); } bool SendRtp(const uint8_t* data, size_t len, @@ -147,7 +145,7 @@ class LoopBackTransport : public webrtc::Transport { const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> crit_; const rtc::scoped_ptr<webrtc::EventWrapper> packet_event_; - const rtc::scoped_ptr<webrtc::ThreadWrapper> thread_; + rtc::PlatformThread thread_; std::deque<Packet> packet_queue_ GUARDED_BY(crit_.get()); const int channel_; std::map<uint32_t, int> channels_ GUARDED_BY(crit_.get()); |