Fixing misleading name in a speech input setting and related variables.

This patch replaces all occurrences of 'censor results' with 'filter profanities', which is a much accurate description of what it does and avoids unfortunate confusions.

BUG=79991
TEST=none

Review URL: http://codereview.chromium.org/8199010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104653 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 11 insertions, 11 deletions

diff --git a/content/browser/speech/speech_input_manager.cc b/content/browser/speech/speech_input_manager.cc
index f3f6402..2f29f77 100644
--- a/content/browser/speech/speech_input_manager.cc
+++ b/content/browser/speech/speech_input_manager.cc
@@ -65,7 +65,7 @@ void SpeechInputManager::StartRecognition(
   request->delegate = delegate;
   request->recognizer = new SpeechRecognizer(
       this, caller_id, language, grammar, context_getter,
-      speech_input_prefs->censor_results(),
+      speech_input_prefs->filter_profanities(),
       request_info_, can_report_metrics_ ? origin_url : "");
   request->is_active = false;
 
diff --git a/content/browser/speech/speech_input_preferences.h b/content/browser/speech/speech_input_preferences.h
index c4536ed..a684cd5 100644
--- a/content/browser/speech/speech_input_preferences.h
+++ b/content/browser/speech/speech_input_preferences.h
@@ -15,9 +15,9 @@ class CONTENT_EXPORT SpeechInputPreferences
   SpeechInputPreferences();
 
   // Only to be called on the IO thread.
-  virtual bool censor_results() const = 0;
+  virtual bool filter_profanities() const = 0;
 
-  virtual void set_censor_results(bool censor_results) = 0;
+  virtual void set_filter_profanities(bool filter_profanities) = 0;
 
  protected:
   virtual ~SpeechInputPreferences();
diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc
index 3a2ad7c..c61c134 100644
--- a/content/browser/speech/speech_recognition_request.cc
+++ b/content/browser/speech/speech_recognition_request.cc
@@ -148,7 +148,7 @@ SpeechRecognitionRequest::~SpeechRecognitionRequest() {}
 
 void SpeechRecognitionRequest::Start(const std::string& language,
                                      const std::string& grammar,
-                                     bool censor_results,
+                                     bool filter_profanities,
                                      const std::string& hardware_info,
                                      const std::string& origin_url,
                                      const std::string& content_type) {
@@ -177,7 +177,7 @@ void SpeechRecognitionRequest::Start(const std::string& language,
   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(filter_profanities ? "pfilter=2" : "pfilter=0");
 
   GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 346951a..2382123 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -51,7 +51,7 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
   // previous request has completed.
   CONTENT_EXPORT void Start(const std::string& language,
                             const std::string& grammar,
-                            bool censor_results,
+                            bool filter_profanities,
                             const std::string& hardware_info,
                             const std::string& origin_url,
                             const std::string& content_type);
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index f81128c..a54c10f 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -58,14 +58,14 @@ SpeechRecognizer::SpeechRecognizer(Delegate* delegate,
                                    const std::string& language,
                                    const std::string& grammar,
                                    net::URLRequestContextGetter* context_getter,
-                                   bool censor_results,
+                                   bool filter_profanities,
                                    const std::string& hardware_info,
                                    const std::string& origin_url)
     : delegate_(delegate),
       caller_id_(caller_id),
       language_(language),
       grammar_(grammar),
-      censor_results_(censor_results),
+      filter_profanities_(filter_profanities),
       hardware_info_(hardware_info),
       origin_url_(origin_url),
       context_getter_(context_getter),
@@ -228,7 +228,7 @@ void SpeechRecognizer::HandleOnData(string* data) {
     // server to send the data and inform the delegate.
     delegate_->DidStartReceivingAudio(caller_id_);
     request_.reset(new SpeechRecognitionRequest(context_getter_.get(), this));
-    request_->Start(language_, grammar_, censor_results_,
+    request_->Start(language_, grammar_, filter_profanities_,
                     hardware_info_, origin_url_, encoder_->mime_type());
   }
 
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index 1e3061a..b62c558 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -85,7 +85,7 @@ class CONTENT_EXPORT SpeechRecognizer
                    const std::string& language,
                    const std::string& grammar,
                    net::URLRequestContextGetter* context_getter,
-                   bool censor_results,
+                   bool filter_profanities,
                    const std::string& hardware_info,
                    const std::string& origin_url);
 
@@ -135,7 +135,7 @@ class CONTENT_EXPORT SpeechRecognizer
   int caller_id_;
   std::string language_;
   std::string grammar_;
-  bool censor_results_;
+  bool filter_profanities_;
   std::string hardware_info_;
   std::string origin_url_;