RefCounted types should not have public destructors, content/browser part 1

BUG=123295
TEST=none


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

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

2 files changed, 12 insertions, 10 deletions

diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc
index d8b765f..d80ae1a 100644
--- a/content/browser/speech/speech_recognizer_impl.cc
+++ b/content/browser/speech/speech_recognizer_impl.cc
@@ -130,10 +130,6 @@ SpeechRecognizerImpl::SpeechRecognizerImpl(
   recognition_engine_->set_delegate(this);
 }
 
-SpeechRecognizerImpl::~SpeechRecognizerImpl() {
-  endpointer_.EndSession();
-}
-
 // -------  Methods that trigger Finite State Machine (FSM) events ------------
 
 // NOTE:all the external events and requests should be enqueued (PostTask), even
@@ -175,6 +171,15 @@ bool SpeechRecognizerImpl::IsCapturingAudio() const {
   return is_capturing_audio;
 }
 
+const SpeechRecognitionEngine&
+SpeechRecognizerImpl::recognition_engine() const {
+  return *(recognition_engine_.get());
+}
+
+SpeechRecognizerImpl::~SpeechRecognizerImpl() {
+  endpointer_.EndSession();
+}
+
 // Invoked in the audio thread.
 void SpeechRecognizerImpl::OnError(AudioInputController* controller,
                                    int error_code) {
@@ -622,11 +627,6 @@ void SpeechRecognizerImpl::UpdateSignalAndNoiseLevels(const float& rms,
       session_id_, clip_detected ? 1.0f : audio_level_, noise_level);
 }
 
-const SpeechRecognitionEngine&
-    SpeechRecognizerImpl::recognition_engine() const {
-  return *(recognition_engine_.get());
-}
-
 void SpeechRecognizerImpl::SetAudioManagerForTesting(
     AudioManager* audio_manager) {
   testing_audio_manager_ = audio_manager;
diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h
index 5b37d61..58ddea2 100644
--- a/content/browser/speech/speech_recognizer_impl.h
+++ b/content/browser/speech/speech_recognizer_impl.h
@@ -48,7 +48,6 @@ class CONTENT_EXPORT SpeechRecognizerImpl
       content::SpeechRecognitionEventListener* listener,
       int session_id,
       SpeechRecognitionEngine* engine);
-  virtual ~SpeechRecognizerImpl();
 
   // content::SpeechRecognizer methods.
   virtual void StartRecognition() OVERRIDE;
@@ -58,6 +57,9 @@ class CONTENT_EXPORT SpeechRecognizerImpl
   virtual bool IsCapturingAudio() const OVERRIDE;
   const SpeechRecognitionEngine& recognition_engine() const;
 
+ protected:
+  virtual ~SpeechRecognizerImpl();
+
  private:
   friend class SpeechRecognizerImplTest;