replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 86 matching lines @@
     runner_->Run();
     login_manager->RemoveObserver(this);
   }
 
   OAuth2LoginManager::SessionRestoreState final_state() { return final_state_; }
 
  private:
   // OAuth2LoginManager::Observer overrides.
   virtual void OnSessionRestoreStateChanged(
       Profile* user_profile,
-      OAuth2LoginManager::SessionRestoreState state) OVERRIDE {
+      OAuth2LoginManager::SessionRestoreState state) override {
     if (!waiting_for_state_)
       return;
 
     if (states_.find(state) == states_.end())
       return;
 
     final_state_ = state;
     waiting_for_state_ = false;
     runner_->Quit();
   }
@@ skipping 93 matching lines @@
             user_id, &oauth_token_status)) {
       user_manager::User::OAuthTokenStatus result =
           static_cast<user_manager::User::OAuthTokenStatus>(oauth_token_status);
       return result;
     }
     return user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN;
   }
 
  protected:
   // OobeBaseTest overrides.
-  virtual Profile* profile() OVERRIDE {
+  virtual Profile* profile() override {
     if (user_manager::UserManager::Get()->GetActiveUser())
       return ProfileManager::GetPrimaryUserProfile();
 
     return OobeBaseTest::profile();
   }
 
   bool AddUserToSession(const std::string& username,
                         const std::string& password) {
     ExistingUserController* controller =
         ExistingUserController::current_controller();
@@ skipping 339 matching lines @@
     if (start_event_.IsSignaled())
       return;
 
     runner_ = new content::MessageLoopRunner;
     runner_->Run();
   }
 
  private:
   // FakeGaia overrides.
   virtual void HandleMergeSession(const HttpRequest& request,
-                                  BasicHttpResponse* http_response) OVERRIDE {
+                                  BasicHttpResponse* http_response) override {
     start_event_.Signal();
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(&DelayedFakeGaia::QuitRunnerOnUIThread,
                    base::Unretained(this)));
     blocking_event_.Wait();
     FakeGaia::HandleMergeSession(request, http_response);
   }
 
   void QuitRunnerOnUIThread() {
     if (runner_.get())
       runner_->Quit();
   }
 
   base::WaitableEvent blocking_event_;
   base::WaitableEvent start_event_;
   scoped_refptr<content::MessageLoopRunner> runner_;
 
   DISALLOW_COPY_AND_ASSIGN(DelayedFakeGaia);
 };
 
 class MergeSessionTest : public OAuth2Test {
  protected:
   MergeSessionTest() : delayed_fake_gaia_(new DelayedFakeGaia()) {
     fake_gaia_.reset(delayed_fake_gaia_);
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     OAuth2Test::SetUpCommandLine(command_line);
 
     // Get fake URL for fake google.com.
     const GURL& server_url = embedded_test_server()->base_url();
     std::string google_host("www.google.com");
     GURL::Replacements replace_google_host;
     replace_google_host.SetHostStr(google_host);
     GURL google_url = server_url.ReplaceComponents(replace_google_host);
     fake_google_page_url_ = google_url.Resolve(kHelloPagePath);
 
     std::string non_google_host("www.somethingelse.org");
     GURL::Replacements replace_non_google_host;
     replace_non_google_host.SetHostStr(non_google_host);
     GURL non_google_url = server_url.ReplaceComponents(replace_non_google_host);
     non_google_page_url_ = non_google_url.Resolve(kRandomPagePath);
 }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     embedded_test_server()->RegisterRequestHandler(
         base::Bind(&FakeGoogle::HandleRequest,
                    base::Unretained(&fake_google_)));
     OAuth2Test::SetUp();
   }
 
  protected:
   void UnblockMergeSession() {
     delayed_fake_gaia_->UnblockMergeSession();
   }
@@ skipping 144 matching lines @@
 
   if (!catcher.GetNextResult()) {
     std::string message = catcher.message();
     ADD_FAILURE() << "Tests failed: " << message;
   }
 
   EXPECT_TRUE(fake_google_.IsPageRequested());
 }
 
 }  // namespace chromeos