Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Unified Diff: content/browser/speech/speech_input_browsertest.cc

Issue 9433006: Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_input_browsertest.cc
===================================================================
--- content/browser/speech/speech_input_browsertest.cc (revision 123165)
+++ content/browser/speech/speech_input_browsertest.cc (working copy)
@@ -72,8 +72,7 @@
const std::string& grammar,
const std::string& origin_url,
net::URLRequestContextGetter* context_getter,
- content::SpeechInputPreferences* speech_input_prefs,
- AudioManager* audio_manager) OVERRIDE {
+ content::SpeechInputPreferences* speech_input_prefs) OVERRIDE {
VLOG(1) << "StartRecognition invoked.";
EXPECT_EQ(0, caller_id_);
EXPECT_EQ(NULL, delegate_);
@@ -115,20 +114,20 @@
}
protected:
- virtual void GetRequestInfo(AudioManager* audio_manager,
- bool* can_report_metrics,
- std::string* request_info) OVERRIDE {}
- virtual void ShowRecognitionRequested(int caller_id, int render_process_id,
- int render_view_id, const gfx::Rect& element_rect) OVERRIDE {}
+ virtual void GetRequestInfo(bool* can_report_metrics,
+ std::string* request_info) OVERRIDE {}
+ virtual void ShowRecognitionRequested(
+ int caller_id, int render_process_id, int render_view_id,
+ const gfx::Rect& element_rect) OVERRIDE {}
virtual void ShowWarmUp(int caller_id) OVERRIDE {}
virtual void ShowRecognizing(int caller_id) OVERRIDE {}
virtual void ShowRecording(int caller_id) OVERRIDE {}
- virtual void ShowInputVolume(int caller_id, float volume,
- float noise_volume) OVERRIDE {}
- virtual void ShowMicError(int caller_id,
- SpeechInputManager::MicError error) OVERRIDE {}
- virtual void ShowRecognizerError(int caller_id,
- content::SpeechInputError error) OVERRIDE {}
+ virtual void ShowInputVolume(
+ int caller_id, float volume, float noise_volume) OVERRIDE {}
+ virtual void ShowMicError(
+ int caller_id, SpeechInputManager::MicError error) OVERRIDE {}
+ virtual void ShowRecognizerError(
+ int caller_id, content::SpeechInputError error) OVERRIDE {}
virtual void DoClose(int caller_id) OVERRIDE {}
private:
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/browser/speech/speech_input_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698