From 0d112b8fadbe994214d9419944ee1e4fba987226 Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <pehrsons@mozilla.com>
Date: Wed, 31 Jan 2018 16:59:53 +0100
Subject: [PATCH] Bug 1434628 - Unbust --disable-webrtc builds. r=padenot, a=me

MozReview-Commit-ID: Ef8LOr1YymV
---
 dom/media/webrtc/MediaEngineSource.cpp     | 9 ++++++---
 dom/media/webrtc/MediaTrackConstraints.cpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dom/media/webrtc/MediaEngineSource.cpp b/dom/media/webrtc/MediaEngineSource.cpp
index 144523c828e0..ef502bea9cbd 100644
--- a/dom/media/webrtc/MediaEngineSource.cpp
+++ b/dom/media/webrtc/MediaEngineSource.cpp
@@ -9,6 +9,9 @@
 
 namespace mozilla {
 
+using dom::MediaSourceEnum;
+using dom::MediaTrackSettings;
+
 // These need a definition somewhere because template
 // code is allowed to take their address, and they aren't
 // guaranteed to have one without this.
@@ -16,7 +19,7 @@ const unsigned int MediaEngineSource::kMaxDeviceNameLength;
 const unsigned int MediaEngineSource::kMaxUniqueIdLength;
 
 /* static */ bool
-MediaEngineSource::IsVideo(dom::MediaSourceEnum aSource)
+MediaEngineSource::IsVideo(MediaSourceEnum aSource)
 {
   switch (aSource) {
     case MediaSourceEnum::Camera:
@@ -64,9 +67,9 @@ MediaEngineSource::TakePhoto(MediaEnginePhotoCallback* aCallback)
 }
 
 void
-MediaEngineSource::GetSettings(dom::MediaTrackSettings& aOutSettings) const
+MediaEngineSource::GetSettings(MediaTrackSettings& aOutSettings) const
 {
-  dom::MediaTrackSettings empty;
+  MediaTrackSettings empty;
   aOutSettings = empty;
 }
 
diff --git a/dom/media/webrtc/MediaTrackConstraints.cpp b/dom/media/webrtc/MediaTrackConstraints.cpp
index 88acd1f51629..a2089e4e81fb 100644
--- a/dom/media/webrtc/MediaTrackConstraints.cpp
+++ b/dom/media/webrtc/MediaTrackConstraints.cpp
@@ -10,9 +10,9 @@
 #include <iterator>
 
 #include "MediaEngineSource.h"
-#include "MediaManager.h"
 #include "nsIScriptError.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
+#include "mozilla/MediaManager.h"
 
 namespace mozilla {