SpeechInputExtensionManager now interface with SpeechRecognitionManagerDelegate

content/browser/speech/speech_recognizer_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/speech/endpointer/endpointer.h"
 #include "content/browser/speech/speech_recognition_engine.h"
-#include "content/public/browser/speech_recognizer.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "media/audio/audio_input_controller.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace content {
 class SpeechRecognitionEventListener;
 }
 
 namespace media {
 class AudioManager;
 }
 
 namespace speech {
 
-// TODO(primiano) Next CL: Remove the Impl suffix and the exported
-// /content/public/browser/speech_recognizer.h interface since this class should
-// not be visible outside (currently we need it for speech input extension API).
+// TODO(primiano) Next CL: Remove the Impl suffix.

[hans, 2012/05/15 13:35:17]

good, I was just about to suggest that :)

[Primiano Tucci (use gerrit), 2012/05/16 10:16:00]

Yep, just trying to avoid too much confusion in this CL.

 
 // Handles speech recognition for a session (identified by |session_id|), taking
 // care of audio capture, silence detection/endpointer and interaction with the
 // SpeechRecognitionEngine.
 class CONTENT_EXPORT SpeechRecognizerImpl
-    : public NON_EXPORTED_BASE(content::SpeechRecognizer),
+    : public base::RefCountedThreadSafe<SpeechRecognizerImpl>,
       public media::AudioInputController::EventHandler,
       public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) {
  public:
   static const int kAudioSampleRate;
   static const ChannelLayout kChannelLayout;
   static const int kNumBitsPerAudioSample;
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
   SpeechRecognizerImpl(
       content::SpeechRecognitionEventListener* listener,
       int session_id,
       SpeechRecognitionEngine* engine);
 
-  // content::SpeechRecognizer methods.
-  virtual void StartRecognition() OVERRIDE;
-  virtual void AbortRecognition() OVERRIDE;
-  virtual void StopAudioCapture() OVERRIDE;
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsCapturingAudio() const OVERRIDE;
+  void StartRecognition();
+  void AbortRecognition();
+  void StopAudioCapture();
+  bool IsActive() const;
+  bool IsCapturingAudio() const;
   const SpeechRecognitionEngine& recognition_engine() const;
 
- protected:
-  virtual ~SpeechRecognizerImpl();
-
  private:
+  friend class base::RefCountedThreadSafe<SpeechRecognizerImpl>;
   friend class SpeechRecognizerImplTest;
 
   enum FSMState {
     STATE_IDLE = 0,
     STATE_STARTING,
     STATE_ESTIMATING_ENVIRONMENT,
     STATE_WAITING_FOR_SPEECH,
     STATE_RECOGNIZING,
     STATE_WAITING_FINAL_RESULT,
     STATE_MAX_VALUE = STATE_WAITING_FINAL_RESULT
@@ skipping 14 matching lines @@
     explicit FSMEventArgs(FSMEvent event_value);
     ~FSMEventArgs();
 
     FSMEvent event;
     int audio_error_code;
     scoped_refptr<AudioChunk> audio_data;
     content::SpeechRecognitionResult engine_result;
     content::SpeechRecognitionError engine_error;
   };
 
+  virtual ~SpeechRecognizerImpl();
+
   // Entry point for pushing any new external event into the recognizer FSM.
   void DispatchEvent(const FSMEventArgs& event_args);
 
   // Defines the behavior of the recognizer FSM, selecting the appropriate
   // transition according to the current state and event.
   FSMState ExecuteTransitionAndGetNextState(const FSMEventArgs& args);
 
   // Process a new audio chunk in the audio pipeline (endpointer, vumeter, etc).
   void ProcessAudioPipeline(const AudioChunk& raw_audio);
 
@@ skipping 49 matching lines @@
   float audio_level_;
   bool is_dispatching_event_;
   FSMState state_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_