Bug 1414421: Change some diagnostic asserts in mscom to stop firing on dev edition; r=Jamie

MozReview-Commit-ID: JfKevpNIiRT

--HG--
extra : rebase_source : 07b6ccd13b5ee589290b7b9e8069f9db5ceaf132

ipc/mscom/Interceptor.cpp

@@ -28,6 +28,15 @@
 #include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
 
+#if defined(MOZ_DEV_EDITION) || defined(RELEASE_OR_BETA)
+
+#define ENSURE_HR_SUCCEEDED(hr) \
+  if (FAILED((HRESULT)hr)) { \
+    return hr; \
+  }
+
+#else
+
 #define ENSURE_HR_SUCCEEDED(hr) \
   if (FAILED((HRESULT)hr)) { \
     nsPrintfCString location("ENSURE_HR_SUCCEEDED \"%s\": %u", __FILE__, __LINE__); \
@@ -37,6 +46,8 @@
     return hr; \
   }
 
+#endif // defined(MOZ_DEV_EDITION) || defined(RELEASE_OR_BETA)
+
 namespace mozilla {
 namespace mscom {
 namespace detail {

ipc/mscom/ProxyStream.cpp

@@ -331,7 +331,9 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject, Environment* aEnv,
 
     marshalResult = ::CoMarshalInterface(stream, aIID, aObject, MSHCTX_LOCAL,
                                          nullptr, mshlFlags);
+#if !defined(MOZ_DEV_EDITION)
     MOZ_DIAGNOSTIC_ASSERT(marshalResult != E_INVALIDARG);
+#endif // !defined(MOZ_DEV_EDITION)
     if (FAILED(marshalResult)) {
       return;
     }