replace OVERRIDE and FINAL with override and final in ui/

ui/views/controls/combobox/combobox_unittest.cc

Index: ui/views/controls/combobox/combobox_unittest.cc
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
index 5621525586692f1c5ed2919b3396b69602102f24..8a2043f02890cb626fa43c3d17d3a746a2343a41 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
+++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -40,7 +40,7 @@ class TestMenuRunnerHandler : public MenuRunnerHandler {
                                           const gfx::Rect& bounds,
                                           MenuAnchorPosition anchor,
                                           ui::MenuSourceType source_type,
-                                          int32 types) OVERRIDE {
+                                          int32 types) override {
     executed_ = true;
     return MenuRunner::NORMAL_EXIT;
   }
@@ -60,13 +60,13 @@ class TestCombobox : public Combobox {
         key_handled_(false),
         key_received_(false) {}
 
-  virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE {
+  virtual bool OnKeyPressed(const ui::KeyEvent& e) override {
     key_received_ = true;
     key_handled_ = Combobox::OnKeyPressed(e);
     return key_handled_;
   }
 
-  virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE {
+  virtual bool OnKeyReleased(const ui::KeyEvent& e) override {
     key_received_ = true;
     key_handled_ = Combobox::OnKeyReleased(e);
     return key_handled_;
@@ -95,21 +95,21 @@ class TestComboboxModel : public ui::ComboboxModel {
   static const int kItemCount = 10;
 
   // ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
+  virtual int GetItemCount() const override {
     return kItemCount;
   }
-  virtual base::string16 GetItemAt(int index) OVERRIDE {
+  virtual base::string16 GetItemAt(int index) override {
     if (IsItemSeparatorAt(index)) {
       NOTREACHED();
       return ASCIIToUTF16("SEPARATOR");
     }
     return ASCIIToUTF16(index % 2 == 0 ? "PEANUT BUTTER" : "JELLY");
   }
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
+  virtual bool IsItemSeparatorAt(int index) override {
     return separators_.find(index) != separators_.end();
   }
 
-  virtual int GetDefaultIndex() const OVERRIDE {
+  virtual int GetDefaultIndex() const override {
     // Return the first index that is not a separator.
     for (int index = 0; index < kItemCount; ++index) {
       if (separators_.find(index) == separators_.end())
@@ -137,13 +137,13 @@ class VectorComboboxModel : public ui::ComboboxModel {
   virtual ~VectorComboboxModel() {}
 
   // ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
+  virtual int GetItemCount() const override {
     return (int)values_->size();
   }
-  virtual base::string16 GetItemAt(int index) OVERRIDE {
+  virtual base::string16 GetItemAt(int index) override {
     return ASCIIToUTF16(values_->at(index));
   }
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
+  virtual bool IsItemSeparatorAt(int index) override {
     return false;
   }
 
@@ -157,7 +157,7 @@ class EvilListener : public ComboboxListener {
   virtual ~EvilListener() {};
 
   // ComboboxListener:
-  virtual void OnPerformAction(Combobox* combobox) OVERRIDE {
+  virtual void OnPerformAction(Combobox* combobox) override {
     delete combobox;
     deleted_ = true;
   }
@@ -175,7 +175,7 @@ class TestComboboxListener : public views::ComboboxListener {
   TestComboboxListener() : perform_action_index_(-1), actions_performed_(0) {}
   virtual ~TestComboboxListener() {}
 
-  virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE {
+  virtual void OnPerformAction(views::Combobox* combobox) override {
     perform_action_index_ = combobox->selected_index();
     actions_performed_++;
   }
@@ -206,7 +206,7 @@ class ComboboxTest : public ViewsTestBase {
  public:
   ComboboxTest() : widget_(NULL), combobox_(NULL) {}
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();