Refactoring of chrome speech recognition architecture (CL1.6)

chrome/browser/speech/speech_input_extension_apitest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/speech/speech_input_extension_api.h"
@@ skipping 59 matching lines @@
     return HasValidRecognizer();
   }
 
   virtual bool HasValidRecognizer() OVERRIDE {
     return recognizer_is_valid_;
   }
 
   virtual void StartRecording(
       content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
-      int caller_id,
+      int session_id,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities) OVERRIDE;
 
   virtual void StopRecording(bool recognition_failed) OVERRIDE;
 
   SpeechInputExtensionManager* GetManager() {
     return manager_.get();
   }
 
   // Auxiliary class used to hook the API manager into the test during its
   // lifetime. Required since browser() is not available during the set up
   // or tear down callbacks, or during the test class construction.
   class AutoManagerHook {
    public:
     explicit AutoManagerHook(SpeechInputExtensionApiTest* test)
         : test_(test) {
       test_->GetManager()->SetSpeechInputExtensionInterface(test_);
     }
 
     ~AutoManagerHook() {
       test_->GetManager()->SetSpeechInputExtensionInterface(NULL);
     }
 
    private:
     SpeechInputExtensionApiTest* test_;
   };
 
  private:
-  void ProvideResults(int caller_id);
+  void ProvideResults(int session_id);
 
   bool recording_devices_available_;
   bool recognizer_is_valid_;
   content::SpeechRecognitionErrorCode next_error_;
   content::SpeechRecognitionResult next_result_;
   int result_delay_ms_;
 
   scoped_refptr<SpeechInputExtensionManager> manager_;
 };
 
 SpeechInputExtensionApiTest::SpeechInputExtensionApiTest()
     : recording_devices_available_(true),
       recognizer_is_valid_(false),
       next_error_(content::SPEECH_RECOGNITION_ERROR_NONE),
       result_delay_ms_(0) {
 }
 
 SpeechInputExtensionApiTest::~SpeechInputExtensionApiTest() {
 }
 
 void SpeechInputExtensionApiTest::StartRecording(
       content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
-      int caller_id,
+      int session_id,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   recognizer_is_valid_ = true;
 
   // Notify that recording started.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::OnAudioStart,
                  GetManager(),
-                 caller_id),
+                 session_id),
       base::TimeDelta());
 
   // Notify sound start in the input device.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::OnSoundStart,
                  GetManager(),
-                 caller_id),
+                 session_id),
       base::TimeDelta());
 
   if (result_delay_ms_ != kDontDispatchCall) {
     // Dispatch the recognition results.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&SpeechInputExtensionApiTest::ProvideResults,
                    this,
-                   caller_id),
+                   session_id),
         base::TimeDelta::FromMilliseconds(result_delay_ms_));
   }
 }
 
 void SpeechInputExtensionApiTest::StopRecording(bool recognition_failed) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   recognizer_is_valid_ = false;
 }
 
-void SpeechInputExtensionApiTest::ProvideResults(int caller_id) {
+void SpeechInputExtensionApiTest::ProvideResults(int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (next_error_ != content::SPEECH_RECOGNITION_ERROR_NONE) {
-    GetManager()->OnRecognitionError(caller_id, next_error_);
+    GetManager()->OnRecognitionError(session_id, next_error_);
     return;
   }
 
-  GetManager()->OnSoundEnd(caller_id);
-  GetManager()->OnAudioEnd(caller_id);
-  GetManager()->OnRecognitionResult(caller_id, next_result_);
+  GetManager()->OnSoundEnd(session_id);
+  GetManager()->OnAudioEnd(session_id);
+  GetManager()->OnRecognitionResult(session_id, next_result_);
 }
 
 // Every test should leave the manager in the idle state when finished.
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, StartStopTest) {
   AutoManagerHook hook(this);
 
   SetRecognitionDelay(kDontDispatchCall);
   ASSERT_TRUE(RunExtensionTest("speech_input/start_stop")) << message_;
 }
 
@@ skipping 14 matching lines @@
   SetRecognitionResult(result);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, RecognitionError) {
   AutoManagerHook hook(this);
 
   SetRecognitionError(content::SPEECH_RECOGNITION_ERROR_NETWORK);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition_error")) << message_;
 }