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

2 files changed, 12 insertions, 11 deletions

diff --git a/chrome/browser/speech/chrome_speech_input_preferences.cc b/chrome/browser/speech/chrome_speech_input_preferences.cc
index e6a2982..ff88d31 100644
--- a/chrome/browser/speech/chrome_speech_input_preferences.cc
+++ b/chrome/browser/speech/chrome_speech_input_preferences.cc
@@ -11,25 +11,26 @@
 
 ChromeSpeechInputPreferences::ChromeSpeechInputPreferences(
     PrefService* pref_service)
-    : censor_results_(
-          pref_service->GetBoolean(prefs::kSpeechInputCensorResults)) {
+    : filter_profanities_(
+          pref_service->GetBoolean(prefs::kSpeechInputFilterProfanities)) {
 }
 
 ChromeSpeechInputPreferences::~ChromeSpeechInputPreferences() {
 }
 
-bool ChromeSpeechInputPreferences::censor_results() const {
+bool ChromeSpeechInputPreferences::filter_profanities() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return censor_results_;
+  return filter_profanities_;
 }
 
-void ChromeSpeechInputPreferences::set_censor_results(bool censor_results) {
+void ChromeSpeechInputPreferences::set_filter_profanities(
+    bool filter_profanities) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&ChromeSpeechInputPreferences::set_censor_results,
-                   this, censor_results));
+        base::Bind(&ChromeSpeechInputPreferences::set_filter_profanities,
+                   this, filter_profanities));
     return;
   }
-  censor_results_ = censor_results;
+  filter_profanities_ = filter_profanities;
 }
diff --git a/chrome/browser/speech/chrome_speech_input_preferences.h b/chrome/browser/speech/chrome_speech_input_preferences.h
index feca5a6..ebfef3b 100644
--- a/chrome/browser/speech/chrome_speech_input_preferences.h
+++ b/chrome/browser/speech/chrome_speech_input_preferences.h
@@ -17,14 +17,14 @@ class ChromeSpeechInputPreferences : public SpeechInputPreferences {
   explicit ChromeSpeechInputPreferences(PrefService* pref_service);
 
   // SpeechInputPreferences methods.
-  virtual bool censor_results() const OVERRIDE;
-  virtual void set_censor_results(bool censor_results) OVERRIDE;
+  virtual bool filter_profanities() const OVERRIDE;
+  virtual void set_filter_profanities(bool filter_profanities) OVERRIDE;
 
  private:
   virtual ~ChromeSpeechInputPreferences();
 
   // Only to be accessed and modified on the IO thread.
-  bool censor_results_;
+  bool filter_profanities_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechInputPreferences);
 };