| Index: talk/app/webrtc/peerconnectionfactory_unittest.cc
|
| diff --git a/talk/app/webrtc/peerconnectionfactory_unittest.cc b/talk/app/webrtc/peerconnectionfactory_unittest.cc
|
| index f1d5353abd008a72b650a416cdf303ce3339dbce..c0edac9fe996f258154649610c8cae2a7d49b8fe 100644
|
| --- a/talk/app/webrtc/peerconnectionfactory_unittest.cc
|
| +++ b/talk/app/webrtc/peerconnectionfactory_unittest.cc
|
| @@ -30,6 +30,9 @@
|
| #include "talk/app/webrtc/fakeportallocatorfactory.h"
|
| #include "talk/app/webrtc/mediastreaminterface.h"
|
| #include "talk/app/webrtc/peerconnectionfactory.h"
|
| +#ifdef WEBRTC_ANDROID
|
| +#include "talk/app/webrtc/test/androidtestinitializer.h"
|
| +#endif
|
| #include "talk/app/webrtc/test/fakedtlsidentitystore.h"
|
| #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
|
| #include "talk/app/webrtc/videosourceinterface.h"
|
| @@ -103,6 +106,9 @@ class NullPeerConnectionObserver : public PeerConnectionObserver {
|
|
|
| class PeerConnectionFactoryTest : public testing::Test {
|
| void SetUp() {
|
| +#ifdef WEBRTC_ANDROID
|
| + webrtc::InitializeAndroidObjects();
|
| +#endif
|
| factory_ = webrtc::CreatePeerConnectionFactory(rtc::Thread::Current(),
|
| rtc::Thread::Current(),
|
| NULL,
|
| @@ -150,6 +156,10 @@ class PeerConnectionFactoryTest : public testing::Test {
|
| // Verify creation of PeerConnection using internal ADM, video factory and
|
| // internal libjingle threads.
|
| TEST(PeerConnectionFactoryTestInternal, CreatePCUsingInternalModules) {
|
| +#ifdef WEBRTC_ANDROID
|
| + webrtc::InitializeAndroidObjects();
|
| +#endif
|
| +
|
| rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
|
| webrtc::CreatePeerConnectionFactory());
|
|
|
|
|