Backout changeset be729bc526a3 (part of bug 864035)

content/media/webspeech/recognition/moz.build

@@ -16,7 +16,6 @@ XPIDL_SOURCES = [
 TEST_DIRS += ['test']
 
 EXPORTS.mozilla.dom += [
-    'EnableWebSpeechRecognitionCheck.h',
     'FakeSpeechRecognitionService.h',
     'SpeechGrammar.h',
     'SpeechGrammarList.h',
@@ -25,8 +24,5 @@ EXPORTS.mozilla.dom += [
     'SpeechRecognitionResult.h',
     'SpeechRecognitionResultList.h',
     'SpeechStreamListener.h',
-    'endpointer.h',
-    'energy_endpointer.h',
-    'energy_endpointer_params.h',
 ]
 

content/media/webspeech/recognition/test/FakeSpeechRecognitionService.h

@@ -8,7 +8,16 @@
 
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
-#include "SpeechRecognition.h"
+
+// nsISpeechRecognitionService needs these declarations
+namespace mozilla {
+  class AudioSegment;
+
+  namespace dom {
+    class SpeechRecognition;
+    class SpeechRecognitionResultList;
+  }
+}
 
 #include "nsISpeechRecognitionService.h"
 

dom/media/MediaManager.h

@@ -2,9 +2,6 @@
  * 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/. */
 
-#ifndef mozilla_dom_MediaManager_h
-#define mozilla_dom_MediaManager_h
-
 #include "MediaEngine.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Services.h"
@@ -496,5 +493,3 @@ private:
 };
 
 } // namespace mozilla
-
-#endif /* mozilla_dom_MediaManager_h */