Refactoring of chrome speech recognition architecture (CL1.6)

content/browser/speech/speech_recognizer_impl_unittest.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 <vector>
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
@@ skipping 129 matching lines @@
   }
 
   void CheckFinalEventsConsistency() {
     // Note: "!(x ^ y)" == "(x && y) || (!x && !x)".
     EXPECT_FALSE(recognition_started_ ^ recognition_ended_);
     EXPECT_FALSE(audio_started_ ^ audio_ended_);
     EXPECT_FALSE(sound_started_ ^ sound_ended_);
   }
 
   // Overridden from content::SpeechRecognitionEventListener:
-  virtual void OnAudioStart(int caller_id) OVERRIDE {
+  virtual void OnAudioStart(int session_id) OVERRIDE {
     audio_started_ = true;
     CheckEventsConsistency();
   }
 
-  virtual void OnAudioEnd(int caller_id) OVERRIDE {
+  virtual void OnAudioEnd(int session_id) OVERRIDE {
     audio_ended_ = true;
     CheckEventsConsistency();
   }
 
   virtual void OnRecognitionResult(
-      int caller_id, const content::SpeechRecognitionResult& result) OVERRIDE {
+      int session_id, const content::SpeechRecognitionResult& result) OVERRIDE {
     result_received_ = true;
   }
 
   virtual void OnRecognitionError(
-      int caller_id, const content::SpeechRecognitionError& error) OVERRIDE {
+      int session_id, const content::SpeechRecognitionError& error) OVERRIDE {
     EXPECT_TRUE(recognition_started_);
     EXPECT_FALSE(recognition_ended_);
     error_ = error.code;
   }
 
-  virtual void OnAudioLevelsChange(int caller_id, float volume,
+  virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE {
     volume_ = volume;
     noise_volume_ = noise_volume;
   }
 
-  virtual void OnRecognitionEnd(int caller_id) OVERRIDE {
+  virtual void OnRecognitionEnd(int session_id) OVERRIDE {
     recognition_ended_ = true;
     CheckEventsConsistency();
   }
 
-  virtual void OnRecognitionStart(int caller_id) OVERRIDE {
+  virtual void OnRecognitionStart(int session_id) OVERRIDE {
     recognition_started_ = true;
     CheckEventsConsistency();
   }
 
-  virtual void OnEnvironmentEstimationComplete(int caller_id) OVERRIDE {}
+  virtual void OnEnvironmentEstimationComplete(int session_id) OVERRIDE {}
 
-  virtual void OnSoundStart(int caller_id) OVERRIDE {
+  virtual void OnSoundStart(int session_id) OVERRIDE {
     sound_started_ = true;
     CheckEventsConsistency();
   }
 
-  virtual void OnSoundEnd(int caller_id) OVERRIDE {
+  virtual void OnSoundEnd(int session_id) OVERRIDE {
     sound_ended_ = true;
     CheckEventsConsistency();
   }
 
   // testing::Test methods.
   virtual void SetUp() OVERRIDE {
     AudioInputController::set_factory_for_testing(
         &audio_input_controller_factory_);
   }
 
@@ skipping 343 matching lines @@
 
   EXPECT_EQ(content::SPEECH_RECOGNITION_ERROR_NONE, error_);
   EXPECT_FALSE(audio_ended_);
   EXPECT_FALSE(recognition_ended_);
   recognizer_->AbortRecognition();
   MessageLoop::current()->RunAllPending();
   CheckFinalEventsConsistency();
 }
 
 }  // namespace speech