replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

chrome/browser/ui/global_error/global_error_service_unittest.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 "chrome/browser/ui/global_error/global_error_service.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Error base class that keeps track of the number of errors that exist.
 class BaseError : public GlobalError {
  public:
   BaseError() { ++count_; }
   virtual ~BaseError() { --count_; }
 
   static int count() { return count_; }
 
-  virtual bool HasMenuItem() OVERRIDE { return false; }
-  virtual int MenuItemCommandID() OVERRIDE {
+  virtual bool HasMenuItem() override { return false; }
+  virtual int MenuItemCommandID() override {
     ADD_FAILURE();
     return 0;
   }
-  virtual base::string16 MenuItemLabel() OVERRIDE {
+  virtual base::string16 MenuItemLabel() override {
     ADD_FAILURE();
     return base::string16();
   }
-  virtual void ExecuteMenuItem(Browser* browser) OVERRIDE { ADD_FAILURE(); }
+  virtual void ExecuteMenuItem(Browser* browser) override { ADD_FAILURE(); }
 
-  virtual bool HasBubbleView() OVERRIDE { return false; }
-  virtual bool HasShownBubbleView() OVERRIDE { return false; }
-  virtual void ShowBubbleView(Browser* browser) OVERRIDE { ADD_FAILURE(); }
-  virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE { return NULL; }
+  virtual bool HasBubbleView() override { return false; }
+  virtual bool HasShownBubbleView() override { return false; }
+  virtual void ShowBubbleView(Browser* browser) override { ADD_FAILURE(); }
+  virtual GlobalErrorBubbleViewBase* GetBubbleView() override { return NULL; }
 
  private:
   // This tracks the number BaseError objects that are currently instantiated.
   static int count_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseError);
 };
 
 int BaseError::count_ = 0;
 
 // A simple error that only has a menu item.
 class MenuError : public BaseError {
  public:
   explicit MenuError(int command_id, Severity severity)
       : command_id_(command_id),
         severity_(severity) {
   }
 
-  virtual Severity GetSeverity() OVERRIDE { return severity_; }
+  virtual Severity GetSeverity() override { return severity_; }
 
-  virtual bool HasMenuItem() OVERRIDE { return true; }
-  virtual int MenuItemCommandID() OVERRIDE { return command_id_; }
-  virtual base::string16 MenuItemLabel() OVERRIDE { return base::string16(); }
-  virtual void ExecuteMenuItem(Browser* browser) OVERRIDE {}
+  virtual bool HasMenuItem() override { return true; }
+  virtual int MenuItemCommandID() override { return command_id_; }
+  virtual base::string16 MenuItemLabel() override { return base::string16(); }
+  virtual void ExecuteMenuItem(Browser* browser) override {}
 
  private:
   int command_id_;
   Severity severity_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuError);
 };
 
 } // namespace
 
@@ skipping 74 matching lines @@
   service.AddGlobalError(error3);
   EXPECT_EQ(error3, service.GetHighestSeverityGlobalErrorWithWrenchMenuItem());
 
   // Remove the highest-severity error.
   service.RemoveGlobalError(error3);
   delete error3;
 
   // Now error2 should be the next highest severity error.
   EXPECT_EQ(error2, service.GetHighestSeverityGlobalErrorWithWrenchMenuItem());
 }