replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

chrome/browser/net/websocket_browsertest.cc

 // Copyright (c) 2012 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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 37 matching lines @@
   void NavigateToHTTPS(const std::string& path) {
     // Visit a HTTPS page for testing.
     std::string scheme("https");
     GURL::Replacements replacements;
     replacements.SetSchemeStr(scheme);
     ui_test_utils::NavigateToURL(
         browser(), wss_server_.GetURL(path).ReplaceComponents(replacements));
   }
 
   // Prepare the title watcher.
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     watcher_.reset(new content::TitleWatcher(
         browser()->tab_strip_model()->GetActiveWebContents(),
         base::ASCIIToUTF16("PASS")));
     watcher_->AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE { watcher_.reset(); }
+  virtual void TearDownOnMainThread() override { watcher_.reset(); }
 
   std::string WaitAndGetTitle() {
     return base::UTF16ToUTF8(watcher_->WaitAndGetTitle());
   }
 
   net::SpawnedTestServer ws_server_;
   net::SpawnedTestServer wss_server_;
 
  private:
   typedef net::SpawnedTestServer::SSLOptions SSLOptions;
   scoped_ptr<content::TitleWatcher> watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketBrowserTest);
 };
 
 // Framework for tests using the connect_to.html page served by a separate HTTP
 // server.
 class WebSocketBrowserConnectToTest : public WebSocketBrowserTest {
  protected:
   WebSocketBrowserConnectToTest()
       : http_server_(net::SpawnedTestServer::TYPE_HTTP,
                      net::SpawnedTestServer::kLocalhost,
                      net::GetWebSocketTestDataDirectory()) {}
 
   // The title watcher and HTTP server are set up automatically by the test
   // framework. Each test case still needs to configure and start the
   // WebSocket server(s) it needs.
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     WebSocketBrowserTest::SetUpOnMainThread();
     ASSERT_TRUE(http_server_.StartInBackground());
   }
 
   // Supply a ws: or wss: URL to connect to.
   void ConnectTo(GURL url) {
     ASSERT_TRUE(http_server_.BlockUntilStarted());
     std::string query("url=" + url.spec());
     GURL::Replacements replacements;
     replacements.SetQueryStr(query);
@@ skipping 18 matching lines @@
         logged_in_(false) {
     registrar_.Add(
         this,
         chrome::NOTIFICATION_AUTH_NEEDED,
         content::Source<content::NavigationController>(navigation_controller));
   }
 
   // NotificationObserver implementation
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     DCHECK_EQ(chrome::NOTIFICATION_AUTH_NEEDED, type);
     scoped_refptr<LoginHandler> login_handler =
         content::Details<LoginNotificationDetails>(details)->handler();
     login_handler->SetAuth(username_, password_);
     logged_in_ = true;
   }
 
   bool logged_in() const { return logged_in_; }
 
  private:
@@ skipping 151 matching lines @@
 // Blink layout tests, and browser tests are expensive to run.
 IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SSLConnectionLimit) {
   ASSERT_TRUE(wss_server_.Start());
 
   NavigateToHTTPS("multiple-connections.html");
 
   EXPECT_EQ("PASS", WaitAndGetTitle());
 }
 
 }  // namespace