Bug 1296684 - export DeviceChangeCallback.h no matter webrtc is enabled or not; r=jib

MozReview-Commit-ID: 9xocLhe1QZw

--HG--
extra : rebase_source : cfa81f49e8b98b93c90a6ea436ee106db7a12f00

dom/media/MediaDevices.h

@@ -10,7 +10,7 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "nsPIDOMWindow.h"
-#include "DeviceChangeCallback.h"
+#include "mozilla/media/DeviceChangeCallback.h"
 
 namespace mozilla {
 namespace dom {

dom/media/MediaManager.h

@@ -6,7 +6,7 @@
 #define MOZILLA_MEDIAMANAGER_H
 
 #include "MediaEngine.h"
-#include "DeviceChangeCallback.h"
+#include "mozilla/media/DeviceChangeCallback.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
 #include "nsAutoPtr.h"

dom/media/systemservices/CamerasChild.h

@@ -12,7 +12,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/camera/PCamerasChild.h"
 #include "mozilla/camera/PCamerasParent.h"
-#include "DeviceChangeCallback.h"
+#include "mozilla/media/DeviceChangeCallback.h"
 #include "mozilla/Mutex.h"
 #include "base/singleton.h"
 #include "nsCOMPtr.h"

dom/media/systemservices/moz.build

@@ -8,7 +8,6 @@ if CONFIG['MOZ_WEBRTC']:
     EXPORTS += [
         'CamerasChild.h',
         'CamerasParent.h',
-        'DeviceChangeCallback.h',
         'LoadManager.h',
         'LoadManagerFactory.h',
         'LoadMonitor.h',
@@ -63,7 +62,8 @@ if CONFIG['_MSC_VER']:
 
 EXPORTS.mozilla += ['ShmemPool.h',]
 
-EXPORTS.mozilla.media += ['MediaChild.h',
+EXPORTS.mozilla.media += ['DeviceChangeCallback.h',
+                          'MediaChild.h',
                           'MediaParent.h',
                           'MediaSystemResourceClient.h',
                           'MediaSystemResourceManager.h',

dom/media/webrtc/MediaEngine.h

@@ -11,7 +11,7 @@
 #include "MediaTrackConstraints.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
 #include "mozilla/dom/VideoStreamTrack.h"
-#include "DeviceChangeCallback.h"
+#include "mozilla/media/DeviceChangeCallback.h"
 
 namespace mozilla {