Issue #80 - De-unify dom/media part 3

Excluding /dom/media/webrtc for bad template use:
MediaTrackConstraints.cpp/h
MediaEngineCameraVideoSource.cpp and
MediaEngineRemoteVideoSource.cpp

dom/media/webspeech/recognition/SpeechGrammarList.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsXPCOMStrings.h"
+#include "SpeechGrammar.h"
 #include "SpeechRecognition.h"
 
 namespace mozilla {

dom/media/webspeech/recognition/SpeechGrammarList.h

@@ -9,6 +9,7 @@
 
 #include "mozilla/Attributes.h"
 #include "nsCOMPtr.h"
+#include "nsTArray.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 

dom/media/webspeech/recognition/SpeechRecognition.cpp

@@ -22,6 +22,7 @@
 #include "AudioSegment.h"
 #include "endpointer.h"
 
+#include "SpeechGrammar.h"
 #include "mozilla/dom/SpeechRecognitionEvent.h"
 #include "nsContentUtils.h"
 #include "nsIDocument.h"

dom/media/webspeech/recognition/moz.build

@@ -31,7 +31,7 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
         'PocketSphinxSpeechRecognitionService.h',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'endpointer.cc',
     'energy_endpointer.cc',
     'energy_endpointer_params.cc',
@@ -45,12 +45,12 @@ UNIFIED_SOURCES += [
 ]
 
 if CONFIG['MOZ_WEBSPEECH_TEST_BACKEND']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'test/FakeSpeechRecognitionService.cpp',
     ]
 
 if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'PocketSphinxSpeechRecognitionService.cpp',
     ]
 

dom/media/webspeech/synth/moz.build

@@ -26,7 +26,7 @@ if CONFIG['MOZ_WEBSPEECH']:
         'SpeechSynthesisVoice.h',
     ]
 
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'ipc/SpeechSynthesisChild.cpp',
         'ipc/SpeechSynthesisParent.cpp',
         'nsSpeechTask.cpp',
@@ -37,7 +37,7 @@ if CONFIG['MOZ_WEBSPEECH']:
     ]
 
     if CONFIG['MOZ_WEBSPEECH_TEST_BACKEND']:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'test/FakeSynthModule.cpp',
             'test/nsFakeSynthServices.cpp'
         ]

dom/media/webspeech/synth/pico/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
 ]

dom/media/webspeech/synth/speechd/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
   'SpeechDispatcherModule.cpp',
   'SpeechDispatcherService.cpp'
 ]

dom/media/webspeech/synth/windows/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
   'SapiModule.cpp',
   'SapiService.cpp'
 ]