Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content...

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/browser/speech/speech_recognizer.h"
 #include "content/public/common/speech_input_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 38 matching lines @@
       content::ResourceContext* resource_context) 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,
+      speech_input::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
       content::ResourceContext* resource_context,
       int caller_id,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities) OVERRIDE;
 
   virtual void StopRecording(bool recognition_failed) OVERRIDE;
 
   SpeechInputExtensionManager* GetManager() {
@@ skipping 32 matching lines @@
     : recording_devices_available_(true),
       recognizer_is_valid_(false),
       next_error_(content::SPEECH_INPUT_ERROR_NONE),
       result_delay_ms_(0) {
 }
 
 SpeechInputExtensionApiTest::~SpeechInputExtensionApiTest() {
 }
 
 void SpeechInputExtensionApiTest::StartRecording(
-      content::SpeechRecognizerDelegate* delegate,
+      speech_input::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
       content::ResourceContext* resource_context,
       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.
@@ skipping 55 matching lines @@
   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);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition_error")) << message_;
 }