Refactoring of chrome speech recognition architecture (CL1.2)

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"
 #include "chrome/browser/speech/speech_input_extension_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/speech_recognizer_delegate.h"
+#include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // Mock class used to test the extension speech input API.
@@ skipping 41 matching lines @@
   virtual bool IsCapturingAudio() OVERRIDE {
     // Only the mock recognizer is supposed to be recording during testing.
     return HasValidRecognizer();
   }
 
   virtual bool HasValidRecognizer() OVERRIDE {
     return recognizer_is_valid_;
   }
 
   virtual void StartRecording(
-      content::SpeechRecognizerDelegate* delegate,
+      content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
       int caller_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();
@@ skipping 33 matching lines @@
     : 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::SpeechRecognizerDelegate* delegate,
+      content::SpeechRecognitionEventListener* listener,
       net::URLRequestContextGetter* context_getter,
       int caller_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::DidStartReceivingAudio,
+      base::Bind(&SpeechInputExtensionManager::OnAudioStart,
                  GetManager(),
                  caller_id),
       base::TimeDelta());
 
   // Notify sound start in the input device.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
-      base::Bind(&SpeechInputExtensionManager::DidStartReceivingSpeech,
+      base::Bind(&SpeechInputExtensionManager::OnSoundStart,
                  GetManager(),
                  caller_id),
       base::TimeDelta());
 
   if (result_delay_ms_ != kDontDispatchCall) {
     // Dispatch the recognition results.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&SpeechInputExtensionApiTest::ProvideResults,
                    this,
                    caller_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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (next_error_ != content::SPEECH_RECOGNITION_ERROR_NONE) {
-    GetManager()->OnRecognizerError(caller_id, next_error_);
+    GetManager()->OnRecognitionError(caller_id, next_error_);
     return;
   }
 
-  GetManager()->DidStopReceivingSpeech(caller_id);
-  GetManager()->SetRecognitionResult(caller_id, next_result_);
+  GetManager()->OnSoundEnd(caller_id);
+  GetManager()->OnAudioEnd(caller_id);
+  GetManager()->OnRecognitionResult(caller_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_;
 }