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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index a56c10c650c00061727e19ae770465ec94803c0d..688c7ba4a2a1c51417ae06340fdcc8538ea3ea07 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -210,36 +210,36 @@ class FakeTheme : public ui::ThemeProvider {
   FakeTheme(NSColor* color) : color_(color) {}
   base::scoped_nsobject<NSColor> color_;
 
-  virtual bool UsingSystemTheme() const OVERRIDE {
+  virtual bool UsingSystemTheme() const override {
     return true;
   }
-  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE {
+  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
     return NULL;
   }
-  virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); }
-  virtual int GetDisplayProperty(int id) const OVERRIDE {
+  virtual SkColor GetColor(int id) const override { return SkColor(); }
+  virtual int GetDisplayProperty(int id) const override {
     return -1;
   }
-  virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; }
-  virtual bool HasCustomImage(int id) const OVERRIDE { return false; }
+  virtual bool ShouldUseNativeFrame() const override { return false; }
+  virtual bool HasCustomImage(int id) const override { return false; }
   virtual base::RefCountedMemory* GetRawData(
       int id,
-      ui::ScaleFactor scale_factor) const OVERRIDE {
+      ui::ScaleFactor scale_factor) const override {
     return NULL;
   }
-  virtual NSImage* GetNSImageNamed(int id) const OVERRIDE {
+  virtual NSImage* GetNSImageNamed(int id) const override {
     return nil;
   }
-  virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE {
+  virtual NSColor* GetNSImageColorNamed(int id) const override {
     return nil;
   }
-  virtual NSColor* GetNSColor(int id) const OVERRIDE {
+  virtual NSColor* GetNSColor(int id) const override {
     return color_.get();
   }
-  virtual NSColor* GetNSColorTint(int id) const OVERRIDE {
+  virtual NSColor* GetNSColorTint(int id) const override {
     return nil;
   }
-  virtual NSGradient* GetNSGradient(int id) const OVERRIDE {
+  virtual NSGradient* GetNSGradient(int id) const override {
     return nil;
   }
 };
@@ -342,7 +342,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
  public:
   base::scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BookmarkBarControllerTestBase::SetUp();
     ASSERT_TRUE(browser());
     AddCommandLineSwitches();