| Index: webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| index fb430eba4dedc0776e2fbe7655a629b30fdba229..b9b4e76f166825403fbeaa9ae42db2ce766ce8b5 100644
|
| --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| @@ -17,12 +17,12 @@
|
|
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "webrtc/base/basictypes.h"
|
| +#include "webrtc/base/platform_thread.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/common_types.h"
|
| #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
|
| #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
| #include "webrtc/system_wrappers/include/event_wrapper.h"
|
| -#include "webrtc/system_wrappers/include/thread_wrapper.h"
|
| #include "webrtc/voice_engine/include/voe_base.h"
|
| #include "webrtc/voice_engine/include/voe_codec.h"
|
| #include "webrtc/voice_engine/include/voe_file.h"
|
| @@ -131,7 +131,7 @@ class ConferenceTransport: public webrtc::Transport {
|
| const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> pq_crit_;
|
| const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> stream_crit_;
|
| const rtc::scoped_ptr<webrtc::EventWrapper> packet_event_;
|
| - const rtc::scoped_ptr<webrtc::ThreadWrapper> thread_;
|
| + const rtc::scoped_ptr<webrtc::PlatformThread> thread_;
|
|
|
| unsigned int rtt_ms_;
|
| unsigned int stream_count_;
|
|
|