Bug 799246: Conditionally enable webrtc unit tests r=jesup,ted,cjones

configure.in

@@ -5264,6 +5264,7 @@ dnl enable once PeerConnection lands
 fi
 
 AC_SUBST(MOZ_WEBRTC)
+AC_SUBST(MOZ_WEBRTC_TESTS)
 AC_SUBST(MOZ_WEBRTC_SIGNALING)
 AC_SUBST(MOZ_PEERCONNECTION)
 AC_SUBST(MOZ_WEBRTC_IN_LIBXUL)

ipc/chromium/src/base/logging.h

@@ -11,6 +11,10 @@
 #include "base/basictypes.h"
 #include "prlog.h"
 
+#ifdef NO_CHROMIUM_LOGGING
+#include <sstream>
+#endif
+
 // Replace the Chromium logging code with NSPR-based logging code and
 // some C++ wrappers to emulate std::ostream
 
@@ -84,9 +88,15 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
   return log;
 }
 
+#ifdef NO_CHROMIUM_LOGGING
+#define LOG(info) std::stringstream()
+#define LOG_IF(info, condition) if (!(condition)) std::stringstream()
+#else
 #define LOG(info) mozilla::LogWrapper(mozilla::LOG_ ## info, __FILE__, __LINE__)
 #define LOG_IF(info, condition) \
   if (!(condition)) mozilla::LogWrapper(mozilla::LOG_ ## info, __FILE__, __LINE__)
+#endif
+
 
 #ifdef DEBUG
 #define DLOG(info) LOG(info)

media/webrtc/signaling/test/mediapipeline_unittest.cpp

@@ -10,6 +10,7 @@
 
 #include "nsThreadUtils.h"
 #include "nsXPCOM.h"
+#include "nss.h"
 #include "ssl.h"
 #include "sslproto.h"
 

toolkit/toolkit-tiers.mk

@@ -292,8 +292,9 @@ tier_platform_dirs += testing/tools/screenshot
 tier_platform_dirs += testing/peptest
 tier_platform_dirs += testing/mozbase
 ifdef MOZ_WEBRTC
-#disabled
-#tier_platform_dirs += media/webrtc/signaling/test
-#tier_platform_dirs += media/mtransport/test
+ifdef MOZ_WEBRTC_TESTS
+tier_platform_dirs += media/webrtc/signaling/test
+tier_platform_dirs += media/mtransport/test
+endif
 endif
 endif