Refactoring of chrome speech recognition architecture (CL1.6)

content/public/browser/speech_recognition_event_listener.h

Index: content/public/browser/speech_recognition_event_listener.h
diff --git a/content/public/browser/speech_recognition_event_listener.h b/content/public/browser/speech_recognition_event_listener.h
index 7ce69959edea9da367a52e2ac8445f75820d09df..10d64b380e6514ca35b69e66ee3b2aa736ea48ae 100644
--- a/content/public/browser/speech_recognition_event_listener.h
+++ b/content/public/browser/speech_recognition_event_listener.h
@@ -19,46 +19,46 @@ class CONTENT_EXPORT SpeechRecognitionEventListener {
  public:
   // Invoked when the StartRequest is received and the recognition process is
   // started.
-  virtual void OnRecognitionStart(int caller_id_id) = 0;
+  virtual void OnRecognitionStart(int session_id) = 0;
 
   // Invoked when the first audio capture is initiated.
-  virtual void OnAudioStart(int caller_id) = 0;
+  virtual void OnAudioStart(int session_id) = 0;
 
   // At the start of recognition, a short amount of audio is recorded to
   // estimate the environment/background noise and this callback is issued
   // after that is complete. Typically the delegate brings up any speech
   // recognition UI once this callback is received.
-  virtual void OnEnvironmentEstimationComplete(int caller_id) = 0;
+  virtual void OnEnvironmentEstimationComplete(int session_id) = 0;
 
   // Informs that the end pointer has started detecting sound (possibly speech).
-  virtual void OnSoundStart(int caller_id) = 0;
+  virtual void OnSoundStart(int session_id) = 0;
 
   // Informs that the end pointer has stopped detecting sound (a long silence).
-  virtual void OnSoundEnd(int caller_id) = 0;
+  virtual void OnSoundEnd(int session_id) = 0;
 
   // Invoked when audio capture stops, either due to the end pointer detecting
   // silence, an internal error, or an explicit stop was issued.
-  virtual void OnAudioEnd(int caller_id) = 0;
+  virtual void OnAudioEnd(int session_id) = 0;
 
   // Invoked when a result is retrieved.
-  virtual void OnRecognitionResult(int caller_id,
+  virtual void OnRecognitionResult(int session_id,
                                    const SpeechRecognitionResult& result) = 0;
 
   // Invoked if there was an error while capturing or recognizing audio.
   // The recognition has already been cancelled when this call is made and
   // no more events will be raised.
-  virtual void OnRecognitionError(int caller_id,
+  virtual void OnRecognitionError(int session_id,
                                   const SpeechRecognitionError& error) = 0;
 
   // Informs of a change in the captured audio level, useful if displaying
   // a microphone volume indicator while recording.
   // The value of |volume| and |noise_volume| is in the [0.0, 1.0] range.
-  virtual void OnAudioLevelsChange(int caller_id, float volume,
-                                   float noise_volume) = 0;
+  virtual void OnAudioLevelsChange(int session_id,
+                                   float volume, float noise_volume) = 0;
 
   // This is guaranteed to be the last event raised in the recognition
   // process and the |SpeechRecognizer| object can be freed if necessary.
-  virtual void OnRecognitionEnd(int caller_id) = 0;
+  virtual void OnRecognitionEnd(int session_id) = 0;
 
 protected:
   virtual ~SpeechRecognitionEventListener() { }