diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 05:07:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 12:08:25 +0000 |
commit | c2282aa89148883769f87c74cc3c4608c0933489 (patch) | |
tree | ffa48a41ac574fc701cac64f5457dfc08d2c0c27 /content/browser/speech | |
parent | c793742b02142aed967568c48def709d6d16bd38 (diff) | |
download | chromium_src-c2282aa89148883769f87c74cc3c4608c0933489.zip chromium_src-c2282aa89148883769f87c74cc3c4608c0933489.tar.gz chromium_src-c2282aa89148883769f87c74cc3c4608c0933489.tar.bz2 |
Standardize usage of virtual/override/final in content/browser/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
BUG=417463
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/667943003
Cr-Commit-Position: refs/heads/master@{#300469}
Diffstat (limited to 'content/browser/speech')
12 files changed, 124 insertions, 130 deletions
diff --git a/content/browser/speech/audio_encoder.cc b/content/browser/speech/audio_encoder.cc index cf9f72d..09b5dca 100644 --- a/content/browser/speech/audio_encoder.cc +++ b/content/browser/speech/audio_encoder.cc @@ -24,9 +24,9 @@ const int kFLACCompressionLevel = 0; // 0 for speed class FLACEncoder : public AudioEncoder { public: FLACEncoder(int sampling_rate, int bits_per_sample); - virtual ~FLACEncoder(); - virtual void Encode(const AudioChunk& raw_audio) override; - virtual void Flush() override; + ~FLACEncoder() override; + void Encode(const AudioChunk& raw_audio) override; + void Flush() override; private: static FLAC__StreamEncoderWriteStatus WriteCallback( @@ -113,9 +113,9 @@ COMPILE_ASSERT(kMaxSpeexFrameLength <= 0xFF, invalidLength); class SpeexEncoder : public AudioEncoder { public: explicit SpeexEncoder(int sampling_rate, int bits_per_sample); - virtual ~SpeexEncoder(); - virtual void Encode(const AudioChunk& raw_audio) override; - virtual void Flush() override {} + ~SpeexEncoder() override; + void Encode(const AudioChunk& raw_audio) override; + void Flush() override {} private: void* encoder_state_; diff --git a/content/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc index ec0aac6..807b6f6 100644 --- a/content/browser/speech/endpointer/endpointer_unittest.cc +++ b/content/browser/speech/endpointer/endpointer_unittest.cc @@ -73,9 +73,7 @@ class EnergyEndpointerFrameProcessor : public FrameProcessor { explicit EnergyEndpointerFrameProcessor(EnergyEndpointer* endpointer) : endpointer_(endpointer) {} - virtual EpStatus ProcessFrame(int64 time, - int16* samples, - int frame_size) override { + EpStatus ProcessFrame(int64 time, int16* samples, int frame_size) override { endpointer_->ProcessAudioFrame(time, samples, kFrameSize, NULL); int64 ep_time; return endpointer_->Status(&ep_time); @@ -118,9 +116,7 @@ class EndpointerFrameProcessor : public FrameProcessor { explicit EndpointerFrameProcessor(Endpointer* endpointer) : endpointer_(endpointer) {} - virtual EpStatus ProcessFrame(int64 time, - int16* samples, - int frame_size) override { + EpStatus ProcessFrame(int64 time, int16* samples, int frame_size) override { scoped_refptr<AudioChunk> frame( new AudioChunk(reinterpret_cast<uint8*>(samples), kFrameSize * 2, 2)); endpointer_->ProcessAudio(*frame.get(), NULL); diff --git a/content/browser/speech/google_one_shot_remote_engine.h b/content/browser/speech/google_one_shot_remote_engine.h index 42aa40f..0e5b09f 100644 --- a/content/browser/speech/google_one_shot_remote_engine.h +++ b/content/browser/speech/google_one_shot_remote_engine.h @@ -33,19 +33,19 @@ class CONTENT_EXPORT GoogleOneShotRemoteEngine static int url_fetcher_id_for_tests; explicit GoogleOneShotRemoteEngine(net::URLRequestContextGetter* context); - virtual ~GoogleOneShotRemoteEngine(); + ~GoogleOneShotRemoteEngine() override; // SpeechRecognitionEngine methods. - virtual void SetConfig(const SpeechRecognitionEngineConfig& config) override; - virtual void StartRecognition() override; - virtual void EndRecognition() override; - virtual void TakeAudioChunk(const AudioChunk& data) override; - virtual void AudioChunksEnded() override; - virtual bool IsRecognitionPending() const override; - virtual int GetDesiredAudioChunkDurationMs() const override; + void SetConfig(const SpeechRecognitionEngineConfig& config) override; + void StartRecognition() override; + void EndRecognition() override; + void TakeAudioChunk(const AudioChunk& data) override; + void AudioChunksEnded() override; + bool IsRecognitionPending() const override; + int GetDesiredAudioChunkDurationMs() const override; // net::URLFetcherDelegate methods. - virtual void OnURLFetchComplete(const net::URLFetcher* source) override; + void OnURLFetchComplete(const net::URLFetcher* source) override; private: SpeechRecognitionEngineConfig config_; diff --git a/content/browser/speech/google_one_shot_remote_engine_unittest.cc b/content/browser/speech/google_one_shot_remote_engine_unittest.cc index a4360ce..1695010 100644 --- a/content/browser/speech/google_one_shot_remote_engine_unittest.cc +++ b/content/browser/speech/google_one_shot_remote_engine_unittest.cc @@ -26,12 +26,12 @@ class GoogleOneShotRemoteEngineTest : public SpeechRecognitionEngineDelegate, void CreateAndTestRequest(bool success, const std::string& http_response); // SpeechRecognitionRequestDelegate methods. - virtual void OnSpeechRecognitionEngineResults( + void OnSpeechRecognitionEngineResults( const SpeechRecognitionResults& results) override { results_ = results; } - virtual void OnSpeechRecognitionEngineError( + void OnSpeechRecognitionEngineError( const SpeechRecognitionError& error) override { error_ = error.code; } diff --git a/content/browser/speech/google_streaming_remote_engine.h b/content/browser/speech/google_streaming_remote_engine.h index cc5c177..961ef08 100644 --- a/content/browser/speech/google_streaming_remote_engine.h +++ b/content/browser/speech/google_streaming_remote_engine.h @@ -57,21 +57,22 @@ class CONTENT_EXPORT GoogleStreamingRemoteEngine static const int kDownstreamUrlFetcherIdForTesting; explicit GoogleStreamingRemoteEngine(net::URLRequestContextGetter* context); - virtual ~GoogleStreamingRemoteEngine(); + ~GoogleStreamingRemoteEngine() override; // SpeechRecognitionEngine methods. - virtual void SetConfig(const SpeechRecognitionEngineConfig& config) override; - virtual void StartRecognition() override; - virtual void EndRecognition() override; - virtual void TakeAudioChunk(const AudioChunk& data) override; - virtual void AudioChunksEnded() override; - virtual bool IsRecognitionPending() const override; - virtual int GetDesiredAudioChunkDurationMs() const override; + void SetConfig(const SpeechRecognitionEngineConfig& config) override; + void StartRecognition() override; + void EndRecognition() override; + void TakeAudioChunk(const AudioChunk& data) override; + void AudioChunksEnded() override; + bool IsRecognitionPending() const override; + int GetDesiredAudioChunkDurationMs() const override; // net::URLFetcherDelegate methods. - virtual void OnURLFetchComplete(const net::URLFetcher* source) override; - virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source, - int64 current, int64 total) override; + void OnURLFetchComplete(const net::URLFetcher* source) override; + void OnURLFetchDownloadProgress(const net::URLFetcher* source, + int64 current, + int64 total) override; private: // Response status codes from the speech recognition webservice. diff --git a/content/browser/speech/google_streaming_remote_engine_unittest.cc b/content/browser/speech/google_streaming_remote_engine_unittest.cc index 3ae6c7f..670bf85 100644 --- a/content/browser/speech/google_streaming_remote_engine_unittest.cc +++ b/content/browser/speech/google_streaming_remote_engine_unittest.cc @@ -42,11 +42,11 @@ class GoogleStreamingRemoteEngineTest : public SpeechRecognitionEngineDelegate, void CreateAndTestRequest(bool success, const std::string& http_response); // SpeechRecognitionRequestDelegate methods. - virtual void OnSpeechRecognitionEngineResults( + void OnSpeechRecognitionEngineResults( const SpeechRecognitionResults& results) override { results_.push(results); } - virtual void OnSpeechRecognitionEngineError( + void OnSpeechRecognitionEngineError( const SpeechRecognitionError& error) override { error_ = error.code; } diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index af02d9f..02671a4 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -44,28 +44,28 @@ class SpeechRecognitionBrowserTest : }; // MockGoogleStreamingServerDelegate methods. - virtual void OnClientConnected() override { + void OnClientConnected() override { ASSERT_EQ(kTestAudioControllerOpened, streaming_server_state_); streaming_server_state_ = kClientConnected; } - virtual void OnClientAudioUpload() override { + void OnClientAudioUpload() override { if (streaming_server_state_ == kClientConnected) streaming_server_state_ = kClientAudioUpload; } - virtual void OnClientAudioUploadComplete() override { + void OnClientAudioUploadComplete() override { ASSERT_EQ(kTestAudioControllerClosed, streaming_server_state_); streaming_server_state_ = kClientAudioUploadComplete; } - virtual void OnClientDisconnected() override { + void OnClientDisconnected() override { ASSERT_EQ(kClientAudioUploadComplete, streaming_server_state_); streaming_server_state_ = kClientDisconnected; } // media::TestAudioInputControllerDelegate methods. - virtual void TestAudioControllerOpened( + void TestAudioControllerOpened( media::TestAudioInputController* controller) override { ASSERT_EQ(kIdle, streaming_server_state_); streaming_server_state_ = kTestAudioControllerOpened; @@ -79,7 +79,7 @@ class SpeechRecognitionBrowserTest : FeedAudioController(1000 /* ms */, /*noise=*/ false); } - virtual void TestAudioControllerClosed( + void TestAudioControllerClosed( media::TestAudioInputController* controller) override { ASSERT_EQ(kClientAudioUpload, streaming_server_state_); streaming_server_state_ = kTestAudioControllerClosed; @@ -103,7 +103,7 @@ class SpeechRecognitionBrowserTest : protected: // ContentBrowserTest methods. - virtual void SetUpInProcessBrowserTestFixture() override { + void SetUpInProcessBrowserTestFixture() override { test_audio_input_controller_factory_.set_delegate(this); media::AudioInputController::set_factory_for_testing( &test_audio_input_controller_factory_); @@ -111,18 +111,18 @@ class SpeechRecognitionBrowserTest : streaming_server_state_ = kIdle; } - virtual void SetUpOnMainThread() override { + void SetUpOnMainThread() override { ASSERT_TRUE(SpeechRecognitionManagerImpl::GetInstance()); SpeechRecognizerImpl::SetAudioManagerForTesting( new media::MockAudioManager(BrowserThread::GetMessageLoopProxyForThread( BrowserThread::IO))); } - virtual void TearDownOnMainThread() override { + void TearDownOnMainThread() override { SpeechRecognizerImpl::SetAudioManagerForTesting(NULL); } - virtual void TearDownInProcessBrowserTestFixture() override { + void TearDownInProcessBrowserTestFixture() override { test_audio_input_controller_factory_.set_delegate(NULL); mock_streaming_server_.reset(); } diff --git a/content/browser/speech/speech_recognition_dispatcher_host.h b/content/browser/speech/speech_recognition_dispatcher_host.h index ac6b0c2..c64904e 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.h +++ b/content/browser/speech/speech_recognition_dispatcher_host.h @@ -34,33 +34,30 @@ class CONTENT_EXPORT SpeechRecognitionDispatcherHost base::WeakPtr<SpeechRecognitionDispatcherHost> AsWeakPtr(); // SpeechRecognitionEventListener methods. - virtual void OnRecognitionStart(int session_id) override; - virtual void OnAudioStart(int session_id) override; - virtual void OnEnvironmentEstimationComplete(int session_id) override; - virtual void OnSoundStart(int session_id) override; - virtual void OnSoundEnd(int session_id) override; - virtual void OnAudioEnd(int session_id) override; - virtual void OnRecognitionEnd(int session_id) override; - virtual void OnRecognitionResults( - int session_id, - const SpeechRecognitionResults& results) override; - virtual void OnRecognitionError( - int session_id, - const SpeechRecognitionError& error) override; - virtual void OnAudioLevelsChange(int session_id, - float volume, - float noise_volume) override; + void OnRecognitionStart(int session_id) override; + void OnAudioStart(int session_id) override; + void OnEnvironmentEstimationComplete(int session_id) override; + void OnSoundStart(int session_id) override; + void OnSoundEnd(int session_id) override; + void OnAudioEnd(int session_id) override; + void OnRecognitionEnd(int session_id) override; + void OnRecognitionResults(int session_id, + const SpeechRecognitionResults& results) override; + void OnRecognitionError(int session_id, + const SpeechRecognitionError& error) override; + void OnAudioLevelsChange(int session_id, + float volume, + float noise_volume) override; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) override; - virtual void OverrideThreadForMessage( - const IPC::Message& message, - BrowserThread::ID* thread) override; + bool OnMessageReceived(const IPC::Message& message) override; + void OverrideThreadForMessage(const IPC::Message& message, + BrowserThread::ID* thread) override; - virtual void OnChannelClosing() override; + void OnChannelClosing() override; private: - virtual ~SpeechRecognitionDispatcherHost(); + ~SpeechRecognitionDispatcherHost() override; void OnStartRequest( const SpeechRecognitionHostMsg_StartRequest_Params& params); diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h index e39e198..9b8da39 100644 --- a/content/browser/speech/speech_recognition_manager_impl.h +++ b/content/browser/speech/speech_recognition_manager_impl.h @@ -58,39 +58,39 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl : static SpeechRecognitionManagerImpl* GetInstance(); // SpeechRecognitionManager implementation. - virtual int CreateSession( - const SpeechRecognitionSessionConfig& config) override; - virtual void StartSession(int session_id) override; - virtual void AbortSession(int session_id) override; - virtual void AbortAllSessionsForRenderProcess(int render_process_id) override; - virtual void AbortAllSessionsForRenderView(int render_process_id, - int render_view_id) override; - virtual void StopAudioCaptureForSession(int session_id) override; - virtual const SpeechRecognitionSessionConfig& GetSessionConfig( + int CreateSession(const SpeechRecognitionSessionConfig& config) override; + void StartSession(int session_id) override; + void AbortSession(int session_id) override; + void AbortAllSessionsForRenderProcess(int render_process_id) override; + void AbortAllSessionsForRenderView(int render_process_id, + int render_view_id) override; + void StopAudioCaptureForSession(int session_id) override; + const SpeechRecognitionSessionConfig& GetSessionConfig( int session_id) const override; - virtual SpeechRecognitionSessionContext GetSessionContext( + SpeechRecognitionSessionContext GetSessionContext( int session_id) const override; - virtual int GetSession(int render_process_id, - int render_view_id, - int request_id) const override; - virtual bool HasAudioInputDevices() override; - virtual base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() override; + int GetSession(int render_process_id, + int render_view_id, + int request_id) const override; + bool HasAudioInputDevices() override; + base::string16 GetAudioInputDeviceModel() override; + void ShowAudioInputSettings() override; // SpeechRecognitionEventListener methods. - virtual void OnRecognitionStart(int session_id) override; - virtual void OnAudioStart(int session_id) override; - virtual void OnEnvironmentEstimationComplete(int session_id) override; - virtual void OnSoundStart(int session_id) override; - virtual void OnSoundEnd(int session_id) override; - virtual void OnAudioEnd(int session_id) override; - virtual void OnRecognitionEnd(int session_id) override; - virtual void OnRecognitionResults( - int session_id, const SpeechRecognitionResults& result) override; - virtual void OnRecognitionError( - int session_id, const SpeechRecognitionError& error) override; - virtual void OnAudioLevelsChange(int session_id, float volume, - float noise_volume) override; + void OnRecognitionStart(int session_id) override; + void OnAudioStart(int session_id) override; + void OnEnvironmentEstimationComplete(int session_id) override; + void OnSoundStart(int session_id) override; + void OnSoundEnd(int session_id) override; + void OnAudioEnd(int session_id) override; + void OnRecognitionEnd(int session_id) override; + void OnRecognitionResults(int session_id, + const SpeechRecognitionResults& result) override; + void OnRecognitionError(int session_id, + const SpeechRecognitionError& error) override; + void OnAudioLevelsChange(int session_id, + float volume, + float noise_volume) override; SpeechRecognitionManagerDelegate* delegate() const { return delegate_.get(); } @@ -101,7 +101,7 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl : friend struct base::DefaultDeleter<SpeechRecognitionManagerImpl>; SpeechRecognitionManagerImpl(media::AudioManager* audio_manager, MediaStreamManager* media_stream_manager); - virtual ~SpeechRecognitionManagerImpl(); + ~SpeechRecognitionManagerImpl() override; private: // Data types for the internal Finite State Machine (FSM). diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index 9fe98be..f6fb390 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -36,7 +36,7 @@ class SpeechRecognizerImpl::OnDataConverter public: OnDataConverter(const AudioParameters& input_params, const AudioParameters& output_params); - virtual ~OnDataConverter(); + ~OnDataConverter() override; // Converts input audio |data| bus into an AudioChunk where the input format // is given by |input_parameters_| and the output format by @@ -45,8 +45,7 @@ class SpeechRecognizerImpl::OnDataConverter private: // media::AudioConverter::InputCallback implementation. - virtual double ProvideInput(AudioBus* dest, - base::TimeDelta buffer_delay) override; + double ProvideInput(AudioBus* dest, base::TimeDelta buffer_delay) override; // Handles resampling, buffering, and channel mixing between input and output // parameters. diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h index b047174..3a26d33 100644 --- a/content/browser/speech/speech_recognizer_impl.h +++ b/content/browser/speech/speech_recognizer_impl.h @@ -47,11 +47,11 @@ class CONTENT_EXPORT SpeechRecognizerImpl bool provisional_results, SpeechRecognitionEngine* engine); - virtual void StartRecognition(const std::string& device_id) override; - virtual void AbortRecognition() override; - virtual void StopAudioCapture() override; - virtual bool IsActive() const override; - virtual bool IsCapturingAudio() const override; + void StartRecognition(const std::string& device_id) override; + void AbortRecognition() override; + void StopAudioCapture() override; + bool IsActive() const override; + bool IsCapturingAudio() const override; const SpeechRecognitionEngine& recognition_engine() const; private: @@ -89,7 +89,7 @@ class CONTENT_EXPORT SpeechRecognizerImpl SpeechRecognitionError engine_error; }; - virtual ~SpeechRecognizerImpl(); + ~SpeechRecognizerImpl() override; // Entry point for pushing any new external event into the recognizer FSM. void DispatchEvent(const FSMEventArgs& event_args); @@ -129,19 +129,19 @@ class CONTENT_EXPORT SpeechRecognizerImpl void OnAudioClosed(media::AudioInputController*); // AudioInputController::EventHandler methods. - virtual void OnCreated(media::AudioInputController* controller) override {} - virtual void OnRecording(media::AudioInputController* controller) override {} - virtual void OnError(media::AudioInputController* controller, - media::AudioInputController::ErrorCode error_code) override; - virtual void OnData(media::AudioInputController* controller, - const media::AudioBus* data) override; - virtual void OnLog(media::AudioInputController* controller, - const std::string& message) override {} + void OnCreated(media::AudioInputController* controller) override {} + void OnRecording(media::AudioInputController* controller) override {} + void OnError(media::AudioInputController* controller, + media::AudioInputController::ErrorCode error_code) override; + void OnData(media::AudioInputController* controller, + const media::AudioBus* data) override; + void OnLog(media::AudioInputController* controller, + const std::string& message) override {} // SpeechRecognitionEngineDelegate methods. - virtual void OnSpeechRecognitionEngineResults( + void OnSpeechRecognitionEngineResults( const SpeechRecognitionResults& results) override; - virtual void OnSpeechRecognitionEngineError( + void OnSpeechRecognitionEngineError( const SpeechRecognitionError& error) override; static media::AudioManager* audio_manager_for_tests_; diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index f85f58d..0cb4f0d 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc @@ -95,52 +95,53 @@ class SpeechRecognizerImplTest : public SpeechRecognitionEventListener, } // Overridden from SpeechRecognitionEventListener: - virtual void OnAudioStart(int session_id) override { + void OnAudioStart(int session_id) override { audio_started_ = true; CheckEventsConsistency(); } - virtual void OnAudioEnd(int session_id) override { + void OnAudioEnd(int session_id) override { audio_ended_ = true; CheckEventsConsistency(); } - virtual void OnRecognitionResults( - int session_id, const SpeechRecognitionResults& results) override { + void OnRecognitionResults(int session_id, + const SpeechRecognitionResults& results) override { result_received_ = true; } - virtual void OnRecognitionError( - int session_id, const SpeechRecognitionError& error) override { + void OnRecognitionError(int session_id, + const SpeechRecognitionError& error) override { EXPECT_TRUE(recognition_started_); EXPECT_FALSE(recognition_ended_); error_ = error.code; } - virtual void OnAudioLevelsChange(int session_id, float volume, - float noise_volume) override { + void OnAudioLevelsChange(int session_id, + float volume, + float noise_volume) override { volume_ = volume; noise_volume_ = noise_volume; } - virtual void OnRecognitionEnd(int session_id) override { + void OnRecognitionEnd(int session_id) override { recognition_ended_ = true; CheckEventsConsistency(); } - virtual void OnRecognitionStart(int session_id) override { + void OnRecognitionStart(int session_id) override { recognition_started_ = true; CheckEventsConsistency(); } - virtual void OnEnvironmentEstimationComplete(int session_id) override {} + void OnEnvironmentEstimationComplete(int session_id) override {} - virtual void OnSoundStart(int session_id) override { + void OnSoundStart(int session_id) override { sound_started_ = true; CheckEventsConsistency(); } - virtual void OnSoundEnd(int session_id) override { + void OnSoundEnd(int session_id) override { sound_ended_ = true; CheckEventsConsistency(); } |