Bug 1274206: Use MediaPref for |mRecognition->mTestConfig.mFakeRecognitionService|, r?cpearce draft
authorThomas Zimmermann <tdz@users.sourceforge.net>
Thu, 19 May 2016 11:14:00 +0200
changeset 368654 f8bd7a0114a30f49be753c04edec2472de907da0
parent 368365 c4449eab07d39e20ea315603f1b1863eeed7dcfe
child 521352 32fb62f106ecf704aaf532ecff64dd7ac32d6980
push id18620
push usertdz@users.sourceforge.net
push dateThu, 19 May 2016 09:14:48 +0000
reviewerscpearce
bugs1274206
milestone49.0a1
Bug 1274206: Use MediaPref for |mRecognition->mTestConfig.mFakeRecognitionService|, r?cpearce MozReview-Commit-ID: Jb9CbpXYhBU
dom/media/webspeech/recognition/PocketSphinxSpeechRecognitionService.cpp
--- a/dom/media/webspeech/recognition/PocketSphinxSpeechRecognitionService.cpp
+++ b/dom/media/webspeech/recognition/PocketSphinxSpeechRecognitionService.cpp
@@ -9,16 +9,17 @@
 #include "PocketSphinxSpeechRecognitionService.h"
 #include "nsIFile.h"
 #include "SpeechGrammar.h"
 #include "SpeechRecognition.h"
 #include "SpeechRecognitionAlternative.h"
 #include "SpeechRecognitionResult.h"
 #include "SpeechRecognitionResultList.h"
 #include "nsIObserverService.h"
+#include "MediaPrefs.h"
 #include "mozilla/Services.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsMemory.h"
 
 extern "C" {
 #include "pocketsphinx/pocketsphinx.h"
 #include "sphinxbase/logmath.h"
@@ -297,17 +298,17 @@ PocketSphinxSpeechRecognitionService::Ab
   return NS_OK;
 }
 
 NS_IMETHODIMP
 PocketSphinxSpeechRecognitionService::Observe(nsISupports* aSubject,
                                               const char* aTopic,
                                               const char16_t* aData)
 {
-  MOZ_ASSERT(mRecognition->mTestConfig.mFakeRecognitionService,
+  MOZ_ASSERT(MediaPrefs::WebSpeechFakeRecognitionService(),
              "Got request to fake recognition service event, "
              "but " TEST_PREFERENCE_FAKE_RECOGNITION_SERVICE " is not set");
 
   if (!strcmp(aTopic, SPEECH_RECOGNITION_TEST_END_TOPIC)) {
     nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
     obs->RemoveObserver(this, SPEECH_RECOGNITION_TEST_EVENT_REQUEST_TOPIC);
     obs->RemoveObserver(this, SPEECH_RECOGNITION_TEST_END_TOPIC);