Index: talk/app/webrtc/peerconnectionfactory_unittest.cc |
diff --git a/talk/app/webrtc/peerconnectionfactory_unittest.cc b/talk/app/webrtc/peerconnectionfactory_unittest.cc |
index 050d5dbb12a05caf06bbb5928324ec989b2edf9e..9fb013b54f8e944d8d5216fd6d24a955f140697d 100644 |
--- a/talk/app/webrtc/peerconnectionfactory_unittest.cc |
+++ b/talk/app/webrtc/peerconnectionfactory_unittest.cc |
@@ -30,6 +30,9 @@ |
#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" |
@@ -98,6 +101,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, |
@@ -143,6 +149,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()); |