Merge inbound to mozilla-central r=merge a=merge

browser/base/content/test/performance/browser.ini

@@ -15,10 +15,11 @@ support-files =
 [browser_appmenu_reflows.js]
 skip-if = asan || debug # Bug 1382809, bug 1369959
 [browser_startup.js]
+skip-if = devedition # We ship startupRecorder.js on DevEdition, but this test still fails with it
 [browser_startup_content.js]
 skip-if = !e10s
 [browser_startup_flicker.js]
-run-if = debug || nightly_build # Requires startuprecorder.js, which is only available on debug & trunk
+run-if = debug || devedition || nightly_build # Requires startupRecorder.js, which isn't shipped everywhere by default
 [browser_tabclose_grow_reflows.js]
 [browser_tabclose_reflows.js]
 [browser_tabopen_reflows.js]

browser/installer/package-manifest.in

@@ -555,7 +555,7 @@
 @RESPATH@/components/TestInterfaceJSMaplike.js
 #endif
 
-#if defined(MOZ_DEBUG) || defined(NIGHTLY_BUILD)
+#if defined(MOZ_DEBUG) || defined(MOZ_DEV_EDITION) || defined(NIGHTLY_BUILD)
 @RESPATH@/browser/components/testComponents.manifest
 @RESPATH@/browser/components/startupRecorder.js
 #endif

build/docs/mozinfo.rst

@@ -86,6 +86,13 @@ debug
 
    Always defined.
 
+devedition
+   Whether this is a devedition build.
+
+   Values are ``true`` and ``false``.
+
+   Always defined.
+
 healthreport
    Whether the Health Report feature is enabled.
 

dom/media/ChannelMediaDecoder.cpp

@@ -337,6 +337,7 @@ ChannelMediaDecoder::NotifyDownloadEnded(nsresult aStatus)
       });
     nsresult rv = GetStateMachine()->OwnerThread()->Dispatch(r.forget());
     MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+    Unused << rv;
     owner->DownloadSuspended();
     // NotifySuspendedStatusChanged will tell the element that download
     // has been suspended "by the cache", which is true since we never
@@ -403,6 +404,7 @@ ChannelMediaDecoder::DurationChanged()
     });
   nsresult rv = GetStateMachine()->OwnerThread()->Dispatch(r.forget());
   MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+  Unused << rv;
 }
 
 void

dom/media/CubebUtils.cpp

@@ -449,12 +449,14 @@ cubeb* GetCubebContextUnlocked()
   }
 
 #ifdef MOZ_CUBEB_REMOTING
-  if (XRE_IsParentProcess()) {
-    // TODO: Don't use audio IPC when within the same process.
-    MOZ_ASSERT(!sIPCConnection.IsValid());
-    sIPCConnection = CreateAudioIPCConnection();
-  } else {
-    MOZ_DIAGNOSTIC_ASSERT(sIPCConnection.IsValid());
+  if (sCubebSandbox) {
+    if (XRE_IsParentProcess()) {
+      // TODO: Don't use audio IPC when within the same process.
+      MOZ_ASSERT(!sIPCConnection.IsValid());
+      sIPCConnection = CreateAudioIPCConnection();
+    } else {
+      MOZ_DIAGNOSTIC_ASSERT(sIPCConnection.IsValid());
+    }
   }
 
   MOZ_LOG(gCubebLog, LogLevel::Info, ("%s: %s", PREF_CUBEB_SANDBOX, sCubebSandbox ? "true" : "false"));
@@ -556,7 +558,7 @@ void InitLibrary()
     NS_NewRunnableFunction("CubebUtils::InitLibrary", &InitBrandName));
 #endif
 #ifdef MOZ_CUBEB_REMOTING
-  if (XRE_IsContentProcess()) {
+  if (sCubebSandbox && XRE_IsContentProcess()) {
     AbstractThread::MainThread()->Dispatch(
       NS_NewRunnableFunction("CubebUtils::InitLibrary", &InitAudioIPCConnection));
   }

js/src/tests/non262/extensions/regress-346773.js

@@ -5,7 +5,7 @@
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 346773;
-var summary = 'Do not crash compiling with misplaced brances in function';
+var summary = 'Do not crash compiling with misplaced branches in function';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp

@@ -578,6 +578,7 @@ public:
         self->InternalProcessAudioChunk(aRate, aChunk, aEnabled);
       }));
     MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
+    Unused << rv;
   }
 
 protected:

python/mozbuild/mozbuild/mozinfo.py

@@ -77,6 +77,7 @@ def build_dict(config, env=os.environ):
     d['debug'] = substs.get('MOZ_DEBUG') == '1'
     d['nightly_build'] = substs.get('NIGHTLY_BUILD') == '1'
     d['release_or_beta'] = substs.get('RELEASE_OR_BETA') == '1'
+    d['devedition'] = substs.get('MOZ_DEV_EDITION') == '1'
     d['pgo'] = substs.get('MOZ_PGO') == '1'
     d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
     d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))