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

chrome/browser/extensions/api/system_display/system_display_apitest.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 "base/debug/leak_annotations.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
 #include "extensions/browser/api/system_display/system_display_api.h"
@@ skipping 24 matching lines @@
       gfx::Rect work_area(0, 0, 960, 720);
       gfx::Display display(i, bounds);
       display.set_work_area(work_area);
       displays_.push_back(display);
     }
   }
   virtual ~MockScreen() {}
 
  protected:
   // Overridden from gfx::Screen:
-  virtual int GetNumDisplays() const OVERRIDE {
+  virtual int GetNumDisplays() const override {
     return displays_.size();
   }
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  virtual std::vector<gfx::Display> GetAllDisplays() const override {
     return displays_;
   }
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
+  virtual gfx::Display GetPrimaryDisplay() const override {
     return displays_[0];
   }
 
  private:
   std::vector<gfx::Display> displays_;
 
   DISALLOW_COPY_AND_ASSIGN(MockScreen);
 };
 #else
 class MockScreen : public Screen {
  public:
   MockScreen() {
     for (int i = 0; i < 4; i++) {
       gfx::Rect bounds(0, 0, 1280, 720);
       gfx::Rect work_area(0, 0, 960, 720);
       gfx::Display display(i, bounds);
       display.set_work_area(work_area);
       displays_.push_back(display);
     }
   }
   virtual ~MockScreen() {}
 
  protected:
   // Overridden from gfx::Screen:
-  virtual bool IsDIPEnabled() OVERRIDE { return true; }
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE  { return gfx::Point(); }
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+  virtual bool IsDIPEnabled() override { return true; }
+  virtual gfx::Point GetCursorScreenPoint() override  { return gfx::Point(); }
+  virtual gfx::NativeWindow GetWindowUnderCursor() override {
     return gfx::NativeWindow();
   }
   virtual gfx::NativeWindow GetWindowAtScreenPoint(
-      const gfx::Point& point) OVERRIDE {
+      const gfx::Point& point) override {
     return gfx::NativeWindow();
   }
-  virtual int GetNumDisplays() const OVERRIDE {
+  virtual int GetNumDisplays() const override {
     return displays_.size();
   }
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  virtual std::vector<gfx::Display> GetAllDisplays() const override {
     return displays_;
   }
   virtual gfx::Display GetDisplayNearestWindow(
-      gfx::NativeView window) const OVERRIDE {
+      gfx::NativeView window) const override {
     return gfx::Display(0);
   }
   virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE {
+      const gfx::Point& point) const override {
     return gfx::Display(0);
   }
   virtual gfx::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const OVERRIDE {
+      const gfx::Rect& match_rect) const override {
     return gfx::Display(0);
   }
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
+  virtual gfx::Display GetPrimaryDisplay() const override {
     return displays_[0];
   }
-  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {}
-  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {}
+  virtual void AddObserver(gfx::DisplayObserver* observer) override {}
+  virtual void RemoveObserver(gfx::DisplayObserver* observer) override {}
 
  private:
   std::vector<gfx::Display> displays_;
 
   DISALLOW_COPY_AND_ASSIGN(MockScreen);
 };
 #endif
 
 class MockDisplayInfoProvider : public DisplayInfoProvider {
  public:
   MockDisplayInfoProvider() {}
 
   virtual ~MockDisplayInfoProvider() {}
 
   virtual bool SetInfo(
       const std::string& display_id,
       const core_api::system_display::DisplayProperties& params,
-      std::string* error) OVERRIDE {
+      std::string* error) override {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
     set_info_value_ = params.ToValue();
     set_info_display_id_ = display_id;
     return true;
   }
 
-  virtual gfx::Screen* GetActiveScreen() OVERRIDE { return NULL; }
+  virtual gfx::Screen* GetActiveScreen() override { return NULL; }
 
   scoped_ptr<base::DictionaryValue> GetSetInfoValue() {
     return set_info_value_.Pass();
   }
 
   std::string GetSetInfoDisplayId() const {
     return set_info_display_id_;
   }
 
  private:
   // Update the content of the |unit| obtained for |display| using
   // platform specific method.
   virtual void UpdateDisplayUnitInfoForPlatform(
       const gfx::Display& display,
-      extensions::core_api::system_display::DisplayUnitInfo* unit) OVERRIDE {
+      extensions::core_api::system_display::DisplayUnitInfo* unit) override {
     int64 id = display.id();
     unit->name = "DISPLAY NAME FOR " + base::Int64ToString(id);
     if (id == 1)
       unit->mirroring_source_id = "0";
     unit->is_primary = id == 0 ? true : false;
     unit->is_internal = id == 0 ? true : false;
     unit->is_enabled = true;
     unit->rotation = (90 * id) % 360;
     unit->dpi_x = 96.0;
     unit->dpi_y = 96.0;
@@ skipping 11 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockDisplayInfoProvider);
 };
 
 class SystemDisplayApiTest: public ExtensionApiTest {
  public:
   SystemDisplayApiTest() : provider_(new MockDisplayInfoProvider),
                            screen_(new MockScreen) {}
 
   virtual ~SystemDisplayApiTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
     ANNOTATE_LEAKING_OBJECT_PTR(
         gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
     DisplayInfoProvider::InitializeForTesting(provider_.get());
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
 #if defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    ash::Shell::GetScreen());
 #endif
     ExtensionApiTest::TearDownOnMainThread();
   }
 
  protected:
   scoped_ptr<MockDisplayInfoProvider> provider_;
   scoped_ptr<gfx::Screen> screen_;
@@ skipping 100 matching lines @@
   EXPECT_EQ(1, utils::GetInteger(overscan, "left"));
   EXPECT_EQ(2, utils::GetInteger(overscan, "top"));
   EXPECT_EQ(3, utils::GetInteger(overscan, "right"));
   EXPECT_EQ(4, utils::GetInteger(overscan, "bottom"));
 
   EXPECT_EQ("display_id", provider_->GetSetInfoDisplayId());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace extensions