Merge m-c to autoland. a=merge

--HG--
extra : rebase_source : 73b562c59886041340979307ee3d32708bb2c7cd

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;
 }
 

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 {