SpeechInputExtensionManager now interface (exclusively) with SpeechRecognitionManagerDelegate (Spee…

content/browser/speech/speech_recognizer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/speech/speech_recognizer_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/time.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/speech/audio_buffer.h"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
-#include "content/public/browser/speech_recognizer.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_grammar.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserMainLoop;
 using content::BrowserThread;
 using content::SpeechRecognitionError;
 using content::SpeechRecognitionEventListener;
 using content::SpeechRecognitionGrammar;
 using content::SpeechRecognitionResult;
-using content::SpeechRecognizer;
 using media::AudioInputController;
 using media::AudioManager;
 using media::AudioParameters;
 
 namespace {
 
 // The following constants are related to the volume level indicator shown in
 // the UI for recorded audio.
 // Multiplier used when new volume is greater than previous level.
 const float kUpSmoothingFactor = 1.0f;
@@ skipping 23 matching lines @@
     }
   }
   return false;
 }
 
 void KeepAudioControllerRefcountedForDtor(scoped_refptr<AudioInputController>) {
 }
 
 }  // namespace
 
-// TODO(primiano) Create(...) is transitional (until we fix speech input
-// extensions) and should be removed soon. The manager should be the only one
-// knowing the existence of SpeechRecognizer(Impl), thus the only one in charge
-// of instantiating it.
-SpeechRecognizer* SpeechRecognizer::Create(
-    SpeechRecognitionEventListener* listener,
-    int session_id,
-    const std::string& language,
-    const std::string& grammar,
-    net::URLRequestContextGetter* context_getter,
-    bool filter_profanities,
-    const std::string& hardware_info,
-    const std::string& origin_url) {
-  speech::SpeechRecognitionEngineConfig remote_engine_config;
-  remote_engine_config.language = language;
-  if (!grammar.empty())
-    remote_engine_config.grammars.push_back(SpeechRecognitionGrammar(grammar));
-  remote_engine_config.audio_sample_rate =
-      speech::SpeechRecognizerImpl::kAudioSampleRate;
-  remote_engine_config.audio_num_bits_per_sample =
-      speech::SpeechRecognizerImpl::kNumBitsPerAudioSample;
-  remote_engine_config.filter_profanities = filter_profanities;
-  remote_engine_config.hardware_info = hardware_info;
-  remote_engine_config.origin_url = origin_url;
-
-  // SpeechRecognizerImpl takes ownership of google_remote_engine.
-  speech::GoogleOneShotRemoteEngine* google_remote_engine =
-      new speech::GoogleOneShotRemoteEngine(context_getter);
-  google_remote_engine->SetConfig(remote_engine_config);
-
-  return new speech::SpeechRecognizerImpl(listener,
-                                          session_id,
-                                          google_remote_engine);
-}
-
 namespace speech {
 
 const int SpeechRecognizerImpl::kAudioSampleRate = 16000;
 const ChannelLayout SpeechRecognizerImpl::kChannelLayout = CHANNEL_LAYOUT_MONO;
 const int SpeechRecognizerImpl::kNumBitsPerAudioSample = 16;
 const int SpeechRecognizerImpl::kNoSpeechTimeoutMs = 8000;
 const int SpeechRecognizerImpl::kEndpointerEstimationTimeMs = 300;
 
 COMPILE_ASSERT(SpeechRecognizerImpl::kNumBitsPerAudioSample % 8 == 0,
                kNumBitsPerAudioSample_must_be_a_multiple_of_8);
@@ skipping 529 matching lines @@
     : event(event_value),
       audio_error_code(0),
       audio_data(NULL),
       engine_error(content::SPEECH_RECOGNITION_ERROR_NONE) {
 }
 
 SpeechRecognizerImpl::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace speech