Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr…

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/common/speech_input_result.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.
 class SpeechInputExtensionApiTest : public ExtensionApiTest,
                                     public SpeechInputExtensionInterface {
  public:
   SpeechInputExtensionApiTest();
   virtual ~SpeechInputExtensionApiTest();
 
   void SetRecordingDevicesAvailable(bool available) {
     recording_devices_available_ = available;
   }
 
-  void SetRecognitionError(content::SpeechInputError error) {
+  void SetRecognitionError(content::SpeechRecognitionErrorCode error) {
     next_error_ = error;
   }
 
-  void SetRecognitionResult(const content::SpeechInputResult& result) {
+  void SetRecognitionResult(const content::SpeechRecognitionResult& result) {
     next_result_ = result;
   }
 
   void SetRecognitionDelay(int result_delay_ms) {
     result_delay_ms_ = result_delay_ms;
   }
 
   // Used as delay when the corresponding call should not be dispatched.
   static const int kDontDispatchCall = -1;
 
   // ExtensionApiTest methods.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
   }
 
   // SpeechInputExtensionInterface methods.
   virtual bool HasAudioInputDevices() OVERRIDE {
     return recording_devices_available_;
   }
 
-  virtual bool IsRecordingInProcess() OVERRIDE {
+  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,
@@ skipping 25 matching lines @@
 
    private:
     SpeechInputExtensionApiTest* test_;
   };
 
  private:
   void ProvideResults(int caller_id);
 
   bool recording_devices_available_;
   bool recognizer_is_valid_;
-  content::SpeechInputError next_error_;
-  content::SpeechInputResult next_result_;
+  content::SpeechRecognitionErrorCode next_error_;
+  content::SpeechRecognitionResult next_result_;
   int result_delay_ms_;
 };
 
 SpeechInputExtensionApiTest::SpeechInputExtensionApiTest()
     : recording_devices_available_(true),
       recognizer_is_valid_(false),
-      next_error_(content::SPEECH_INPUT_ERROR_NONE),
+      next_error_(content::SPEECH_RECOGNITION_ERROR_NONE),
       result_delay_ms_(0) {
 }
 
 SpeechInputExtensionApiTest::~SpeechInputExtensionApiTest() {
 }
 
 void SpeechInputExtensionApiTest::StartRecording(
       content::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
       int caller_id,
@@ skipping 31 matching lines @@
 }
 
 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_INPUT_ERROR_NONE) {
+  if (next_error_ != content::SPEECH_RECOGNITION_ERROR_NONE) {
     GetManager()->OnRecognizerError(caller_id, next_error_);
     return;
   }
 
   GetManager()->DidStopReceivingSpeech(caller_id);
   GetManager()->SetRecognitionResult(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_;
 }
 
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, NoDevicesAvailable) {
   AutoManagerHook hook(this);
 
   SetRecordingDevicesAvailable(false);
   ASSERT_TRUE(RunExtensionTest("speech_input/start_error")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, RecognitionSuccessful) {
   AutoManagerHook hook(this);
 
-  content::SpeechInputResult result;
+  content::SpeechRecognitionResult result;
   result.hypotheses.push_back(
-      content::SpeechInputHypothesis(UTF8ToUTF16("this is a test"), 0.99));
+      content::SpeechRecognitionHypothesis(
+          UTF8ToUTF16("this is a test"), 0.99));
   SetRecognitionResult(result);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, RecognitionError) {
   AutoManagerHook hook(this);
 
-  SetRecognitionError(content::SPEECH_INPUT_ERROR_NETWORK);
+  SetRecognitionError(content::SPEECH_RECOGNITION_ERROR_NETWORK);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition_error")) << message_;
 }