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

content/browser/speech/speech_recognizer.cc

Index: content/browser/speech/speech_recognizer.cc
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index f6019f6647bee81866e6423e7d732a2dd08b6c0b..db821a3d6f1345867b680bb6741ef6dd0bb4d866 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -6,8 +6,7 @@
 
 #include "base/time.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
-#include "content/common/content_client.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using media::AudioInputController;
@@ -59,16 +58,18 @@ SpeechRecognizer::SpeechRecognizer(Delegate* delegate,
                                    int caller_id,
                                    const std::string& language,
                                    const std::string& grammar,
-                                   bool censor_results,
+                                   net::URLRequestContextGetter* context_getter,
+                                   SpeechInputPreferences* speech_input_prefs,
                                    const std::string& hardware_info,
                                    const std::string& origin_url)
     : delegate_(delegate),
       caller_id_(caller_id),
       language_(language),
       grammar_(grammar),
-      censor_results_(censor_results),
       hardware_info_(hardware_info),
       origin_url_(origin_url),
+      context_getter_(context_getter),
+      speech_input_prefs_(speech_input_prefs),
       codec_(AudioEncoder::CODEC_FLAC),
       encoder_(NULL),
       endpointer_(kAudioSampleRate),
@@ -224,13 +225,9 @@ void SpeechRecognizer::HandleOnData(string* data) {
     // This was the first audio packet recorded, so start a request to the
     // server to send the data and inform the delegate.
     delegate_->DidStartReceivingAudio(caller_id_);
-    // Deprecated; see http://crbug.com/92366
-    net::URLRequestContextGetter* context_getter =
-        content::GetContentClient()->browser()->
-            GetDefaultRequestContextDeprecatedCrBug64339();
-    request_.reset(new SpeechRecognitionRequest(context_getter, this));
-    request_->Start(language_, grammar_, censor_results_, hardware_info_,
-                    origin_url_, encoder_->mime_type());
+    request_.reset(new SpeechRecognitionRequest(context_getter_.get(), this));
+    request_->Start(language_, grammar_, speech_input_prefs_.get(),
+                    hardware_info_, origin_url_, encoder_->mime_type());
   }
 
   string encoded_data;