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

content/browser/speech/speech_input_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "content/browser/speech/speech_recognizer.h"
 #include "content/common/content_export.h"
 #include "content/common/speech_input_result.h"
 #include "ui/gfx/rect.h"
 
+class SpeechInputPreferences;
+
 namespace speech_input {
 
 // This is the gatekeeper for speech recognition in the browser process. It
 // handles requests received from various render views and makes sure only one
 // of them can use speech recognition at a time. It also sends recognition
 // results and status events to the render views when required.
 class CONTENT_EXPORT SpeechInputManager : public SpeechRecognizerDelegate {
  public:
   // Implemented by the dispatcher host to relay events to the render views.
   class Delegate {
@@ skipping 24 matching lines @@
   // request.
   // |element_rect| is the display bounds of the html element requesting speech
   // input (in page coordinates).
   virtual void StartRecognition(Delegate* 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);
   virtual void CancelRecognition(int caller_id);
   virtual void CancelAllRequestsWithDelegate(Delegate* delegate);
   virtual void StopRecording(int caller_id);
 
   // SpeechRecognizer::Delegate methods.
   virtual void DidStartReceivingAudio(int caller_id);
   virtual void SetRecognitionResult(int caller_id,
                                     bool error,
                                     const SpeechInputResultArray& result);
   virtual void DidCompleteRecording(int caller_id);
   virtual void DidCompleteRecognition(int caller_id);
   virtual void OnRecognizerError(int caller_id,
                                  SpeechRecognizer::ErrorCode error);
   virtual void DidCompleteEnvironmentEstimation(int caller_id);
   virtual void SetInputVolume(int caller_id, float volume, float noise_volume);
 
-  void set_censor_results(bool censor) { censor_results_ = censor; }
-
-  bool censor_results() { return censor_results_; }
-
  protected:
   // The pure virtual methods are used for displaying the current state of
   // recognition and for fetching optional request information.
 
   // Get the optional request information if available.
   virtual void GetRequestInfo(bool* can_report_metrics,
                               std::string* request_info) = 0;
 
   // Called when recognition has been requested from point |element_rect_| on
   // the view port for the given caller.
@@ skipping 45 matching lines @@
     scoped_refptr<SpeechRecognizer> recognizer;
     bool is_active;  // Set to true when recording or recognition is going on.
   };
 
   Delegate* GetDelegate(int caller_id) const;
 
   typedef std::map<int, SpeechInputRequest> SpeechRecognizerMap;
   SpeechRecognizerMap requests_;
   std::string request_info_;
   bool can_report_metrics_;
-  bool censor_results_;
   int recording_caller_id_;
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputManager::Delegate SpeechInputManagerDelegate;
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_