Replacing the OVERRIDE with override and FINAL with final in content/browser/speech

content/browser/speech/speech_recognition_browsertest.cc

 // Copyright 2013 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.
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 26 matching lines @@
     kIdle,
     kTestAudioControllerOpened,
     kClientConnected,
     kClientAudioUpload,
     kClientAudioUploadComplete,
     kTestAudioControllerClosed,
     kClientDisconnected
   };
 
   // MockGoogleStreamingServerDelegate methods.
-  virtual void OnClientConnected() OVERRIDE {
+  virtual void OnClientConnected() override {
     ASSERT_EQ(kTestAudioControllerOpened, streaming_server_state_);
     streaming_server_state_ = kClientConnected;
   }
 
-  virtual void OnClientAudioUpload() OVERRIDE {
+  virtual void OnClientAudioUpload() override {
     if (streaming_server_state_ == kClientConnected)
       streaming_server_state_ = kClientAudioUpload;
   }
 
-  virtual void OnClientAudioUploadComplete() OVERRIDE {
+  virtual void OnClientAudioUploadComplete() override {
     ASSERT_EQ(kTestAudioControllerClosed, streaming_server_state_);
     streaming_server_state_ = kClientAudioUploadComplete;
   }
 
-  virtual void OnClientDisconnected() OVERRIDE {
+  virtual void OnClientDisconnected() override {
     ASSERT_EQ(kClientAudioUploadComplete, streaming_server_state_);
     streaming_server_state_ = kClientDisconnected;
   }
 
   // media::TestAudioInputControllerDelegate methods.
   virtual void TestAudioControllerOpened(
-      media::TestAudioInputController* controller) OVERRIDE {
+      media::TestAudioInputController* controller) override {
     ASSERT_EQ(kIdle, streaming_server_state_);
     streaming_server_state_ = kTestAudioControllerOpened;
     const int capture_packet_interval_ms =
         (1000 * controller->audio_parameters().frames_per_buffer()) /
         controller->audio_parameters().sample_rate();
     ASSERT_EQ(GoogleStreamingRemoteEngine::kAudioPacketIntervalMs,
         capture_packet_interval_ms);
     FeedAudioController(500 /* ms */, /*noise=*/ false);
     FeedAudioController(1000 /* ms */, /*noise=*/ true);
     FeedAudioController(1000 /* ms */, /*noise=*/ false);
   }
 
   virtual void TestAudioControllerClosed(
-      media::TestAudioInputController* controller) OVERRIDE {
+      media::TestAudioInputController* controller) override {
     ASSERT_EQ(kClientAudioUpload, streaming_server_state_);
     streaming_server_state_ = kTestAudioControllerClosed;
     mock_streaming_server_->MockGoogleStreamingServer::SimulateResult(
         GetGoodSpeechResult());
   }
 
   // Helper methods used by test fixtures.
   GURL GetTestUrlFromFragment(const std::string fragment) {
     return GURL(GetTestUrl("speech", "web_speech_recognition.html").spec() +
         "#" + fragment);
   }
 
   std::string GetPageFragment() {
     return shell()->web_contents()->GetURL().ref();
   }
 
   const StreamingServerState &streaming_server_state() {
     return streaming_server_state_;
   }
 
  protected:
   // ContentBrowserTest methods.
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     test_audio_input_controller_factory_.set_delegate(this);
     media::AudioInputController::set_factory_for_testing(
         &test_audio_input_controller_factory_);
     mock_streaming_server_.reset(new MockGoogleStreamingServer(this));
     streaming_server_state_ = kIdle;
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ASSERT_TRUE(SpeechRecognitionManagerImpl::GetInstance());
     SpeechRecognizerImpl::SetAudioManagerForTesting(
         new media::MockAudioManager(BrowserThread::GetMessageLoopProxyForThread(
             BrowserThread::IO)));
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     SpeechRecognizerImpl::SetAudioManagerForTesting(NULL);
   }
 
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+  virtual void TearDownInProcessBrowserTestFixture() override {
     test_audio_input_controller_factory_.set_delegate(NULL);
     mock_streaming_server_.reset();
   }
 
  private:
   static void FeedSingleBufferToAudioController(
       scoped_refptr<media::TestAudioInputController> controller,
       size_t buffer_size,
       bool fill_with_noise) {
     DCHECK(controller.get());
@@ skipping 68 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, OneShotRecognition) {
   NavigateToURLBlockUntilNavigationsComplete(
       shell(), GetTestUrlFromFragment("oneshot"), 2);
 
   EXPECT_EQ(kClientDisconnected, streaming_server_state());
   EXPECT_EQ("goodresult1", GetPageFragment());
 }
 
 }  // namespace content