Remove use of default request context and fix use of speech censor flag

content/browser/speech/speech_input_manager.cc

 // 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_input_manager.h"
 
 #include "content/browser/browser_thread.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "media/audio/audio_manager.h"
 
 namespace speech_input {
 
 SpeechInputManager::SpeechInputManager()
     : can_report_metrics_(false),
-      censor_results_(true),
       recording_caller_id_(0) {
 }
 
 SpeechInputManager::~SpeechInputManager() {
   while (requests_.begin() != requests_.end())
     CancelRecognition(requests_.begin()->first);
 }
 
 bool SpeechInputManager::HasPendingRequest(int caller_id) const {
   return requests_.find(caller_id) != requests_.end();
@@ skipping 20 matching lines @@
 }
 
 void SpeechInputManager::StartRecognition(
     SpeechInputManagerDelegate* delegate,
     int caller_id,
     int render_process_id,
     int render_view_id,
     const gfx::Rect& element_rect,
     const std::string& language,
     const std::string& grammar,
-    const std::string& origin_url) {
+    const std::string& origin_url,
+    net::URLRequestContextGetter* context_getter,
+    SpeechInputPreferences* speech_input_prefs) {
   DCHECK(!HasPendingRequest(caller_id));
 
   ShowRecognitionRequested(
       caller_id, render_process_id, render_view_id, element_rect);
   GetRequestInfo(&can_report_metrics_, &request_info_);
 
   SpeechInputRequest* request = &requests_[caller_id];
   request->delegate = delegate;
   request->recognizer = new SpeechRecognizer(
-      this, caller_id, language, grammar, censor_results(),
+      this, caller_id, language, grammar, context_getter,
+      speech_input_prefs->censor_results(),
       request_info_, can_report_metrics_ ? origin_url : "");
   request->is_active = false;
 
   StartRecognitionForRequest(caller_id);
 }
 
 void SpeechInputManager::StartRecognitionForRequest(int caller_id) {
   DCHECK(HasPendingRequest(caller_id));
 
   // If we are currently recording audio for another caller, abort that cleanly.
@@ skipping 110 matching lines @@
 
 SpeechInputManager::SpeechInputRequest::SpeechInputRequest()
     : delegate(NULL),
       is_active(false) {
 }
 
 SpeechInputManager::SpeechInputRequest::~SpeechInputRequest() {
 }
 
 }  // namespace speech_input