From 291fa9a01322b95d4cee038d45e30e7b2d03ca86 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Mon, 14 Oct 2013 14:32:08 -0400 Subject: [PATCH] Bug 910810: don't read prefs off "main" thread in unittests r=abr --- media/webrtc/signaling/src/media-conduit/AudioConduit.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp index 94d597a32ea..79e93cebd26 100644 --- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp @@ -310,6 +310,7 @@ WebrtcAudioConduit::ConfigureSendMediaCodec(const AudioCodecConfig* codecConfig) return kMediaConduitUnknownError; } +#ifdef MOZILLA_INTERNAL_API // TEMPORARY - see bug 694814 comment 2 nsresult rv; nsCOMPtr prefs = do_GetService("@mozilla.org/preferences-service;1", &rv); @@ -331,6 +332,7 @@ WebrtcAudioConduit::ConfigureSendMediaCodec(const AudioCodecConfig* codecConfig) branch->GetIntPref("media.peerconnection.capture_delay", &mCaptureDelay); } } +#endif if (0 != (error = mPtrVoEProcessing->SetEcStatus(mEchoOn, mEchoCancel))) { CSFLogError(logTag,"%s Error setting EVStatus: %d ",__FUNCTION__, error);