Backed out changeset 62efa118ea7f (bug 1381638) for browser_devices_get_user_media_in_frame.js failures.

dom/media/MediaManager.cpp

@@ -1232,13 +1232,8 @@ public:
                                                  self->mSourceListener->GetPrincipalHandle());
         if (NS_FAILED(rv)) {
           nsString log;
-          if (rv == NS_ERROR_NOT_AVAILABLE) {
-            log.AssignASCII("Concurrent mic process limit.");
-            error = new MediaMgrError(NS_LITERAL_STRING("NotReadableError"), log);
-          } else {
-            log.AssignASCII("Starting audio failed");
-            error = new MediaMgrError(NS_LITERAL_STRING("InternalError"), log);
-          }
+          log.AssignASCII("Starting audio failed");
+          error = new MediaMgrError(NS_LITERAL_STRING("InternalError"), log);
         }
       }
 

dom/media/webrtc/MediaEngineWebRTCAudio.cpp

@@ -474,13 +474,6 @@ MediaEngineWebRTCMicrophoneSource::Start(SourceMediaStream *aStream,
     return NS_ERROR_FAILURE;
   }
 
-  // Until we fix bug 1400488 we need to block a second tab (OuterWindow)
-  // from opening an already-open device.  If it's the same tab, they
-  // will share a Graph(), and we can allow it.
-  if (!mSources.IsEmpty() && aStream->Graph() != mSources[0]->Graph()) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
   {
     MonitorAutoLock lock(mMonitor);
     mSources.AppendElement(aStream);