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

content/browser/speech/speech_recognition_request.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_recognition_request.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 const char* const kDefaultSpeechRecognitionUrl =
     "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
@@ skipping 92 matching lines @@
     net::URLRequestContextGetter* context, Delegate* delegate)
     : url_context_(context),
       delegate_(delegate) {
   DCHECK(delegate);
 }
 
 SpeechRecognitionRequest::~SpeechRecognitionRequest() {}
 
 void SpeechRecognitionRequest::Start(const std::string& language,
                                      const std::string& grammar,
-                                     bool censor_results,
+                                     SpeechInputPreferences* speech_input_prefs,
                                      const std::string& hardware_info,
                                      const std::string& origin_url,
                                      const std::string& content_type) {
   DCHECK(!url_fetcher_.get());
 
   std::vector<std::string> parts;
 
   std::string lang_param = language;
   if (lang_param.empty() && url_context_) {
     // If no language is provided then we use the first from the accepted
     // language list. If this list is empty then it defaults to "en-US".
     // Example of the contents of this list: "es,en-GB;q=0.8", ""
     net::URLRequestContext* request_context =
         url_context_->GetURLRequestContext();
     DCHECK(request_context);
     std::string accepted_language_list = request_context->accept_language();
     size_t separator = accepted_language_list.find_first_of(",;");
     lang_param = accepted_language_list.substr(0, separator);
   }
   if (lang_param.empty())
     lang_param = "en-US";
   parts.push_back("lang=" + net::EscapeQueryParamValue(lang_param, true));
 
   if (!grammar.empty())
     parts.push_back("lm=" + net::EscapeQueryParamValue(grammar, true));
   if (!hardware_info.empty())
     parts.push_back("xhw=" + net::EscapeQueryParamValue(hardware_info, true));
   parts.push_back("maxresults=" + base::IntToString(kMaxResults));
-  parts.push_back(censor_results ? "pfilter=2" : "pfilter=0");
+  parts.push_back(speech_input_prefs->censor_results()
+                  ? "pfilter=2" : "pfilter=0");
 
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
   url_fetcher_.reset(URLFetcher::Create(url_fetcher_id_for_tests,
                                         url,
                                         URLFetcher::POST,
                                         this));
   url_fetcher_->set_chunked_upload(content_type);
   url_fetcher_->set_request_context(url_context_);
   url_fetcher_->set_referrer(origin_url);
@@ skipping 27 matching lines @@
   SpeechInputResultArray result;
   if (!error)
     error = !ParseServerResponse(data, &result);
   url_fetcher_.reset();
 
   DVLOG(1) << "SpeechRecognitionRequest: Invoking delegate with result.";
   delegate_->SetRecognitionResult(error, result);
 }
 
 }  // namespace speech_input