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

content/browser/speech/speech_recognizer.cc

-// 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.
 
 #include "content/browser/speech/speech_recognizer.h"
 
 #include "base/bind.h"
 #include "base/time.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/speech_recognizer_delegate.h"
 #include "content/public/common/speech_input_result.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 using media::AudioInputController;
 using std::string;
 
 namespace {
 
 // The following constants are related to the volume level indicator shown in
@@ skipping 29 matching lines @@
 
 namespace speech_input {
 
 const int SpeechRecognizer::kAudioSampleRate = 16000;
 const int SpeechRecognizer::kAudioPacketIntervalMs = 100;
 const ChannelLayout SpeechRecognizer::kChannelLayout = CHANNEL_LAYOUT_MONO;
 const int SpeechRecognizer::kNumBitsPerAudioSample = 16;
 const int SpeechRecognizer::kNoSpeechTimeoutSec = 8;
 const int SpeechRecognizer::kEndpointerEstimationTimeMs = 300;
 
-SpeechRecognizer::SpeechRecognizer(content::SpeechRecognizerDelegate* delegate,
+SpeechRecognizer::SpeechRecognizer(Delegate* delegate,
                                    int caller_id,
                                    const std::string& language,
                                    const std::string& grammar,
                                    net::URLRequestContextGetter* context_getter,
                                    AudioManager* audio_manager,
                                    bool filter_profanities,
                                    const std::string& hardware_info,
                                    const std::string& origin_url)
     : delegate_(delegate),
       caller_id_(caller_id),
@@ skipping 242 matching lines @@
   // and switch to async. version of this method. Compare with how
   // it's done in e.g. the AudioRendererHost.
   base::WaitableEvent closed_event(true, false);
   audio_controller_->Close(base::Bind(&base::WaitableEvent::Signal,
                            base::Unretained(&closed_event)));
   closed_event.Wait();
   audio_controller_ = NULL;  // Releases the ref ptr.
 }
 
 }  // namespace speech_input