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

content/browser/speech/speech_recognizer_unittest.cc

Index: content/browser/speech/speech_recognizer_unittest.cc
===================================================================
--- content/browser/speech/speech_recognizer_unittest.cc	(revision 121818)
+++ content/browser/speech/speech_recognizer_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,7 +6,6 @@
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/speech/speech_recognizer.h"
-#include "content/public/browser/speech_recognizer_delegate.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/test_audio_input_controller_factory.h"
@@ -22,7 +21,7 @@
 
 namespace speech_input {
 
-class SpeechRecognizerTest : public content::SpeechRecognizerDelegate,
+class SpeechRecognizerTest : public SpeechRecognizerDelegate,
                              public testing::Test {
  public:
   SpeechRecognizerTest()
@@ -45,7 +44,7 @@
     audio_packet_.resize(audio_packet_length_bytes);
   }
 
-  // Overridden from content::SpeechRecognizerDelegate:
+  // SpeechRecognizer::Delegate methods.
   virtual void SetRecognitionResult(
       int caller_id,
       const content::SpeechInputResult& result) OVERRIDE {