replace OVERRIDE and FINAL with override and final in ui/

ui/app_list/app_list_model_unittest.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 "ui/app_list/app_list_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
   TestObserver()
       : status_changed_count_(0),
         items_added_(0),
         items_removed_(0),
         items_updated_(0) {
   }
   virtual ~TestObserver() {
   }
 
   // AppListModelObserver
-  virtual void OnAppListModelStatusChanged() OVERRIDE {
+  virtual void OnAppListModelStatusChanged() override {
     ++status_changed_count_;
   }
 
-  virtual void OnAppListItemAdded(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemAdded(AppListItem* item) override {
     items_added_++;
   }
 
-  virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemWillBeDeleted(AppListItem* item) override {
     items_removed_++;
   }
 
-  virtual void OnAppListItemUpdated(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemUpdated(AppListItem* item) override {
     items_updated_++;
   }
 
   int status_changed_count() const { return status_changed_count_; }
   size_t items_added() { return items_added_; }
   size_t items_removed() { return items_removed_; }
   size_t items_updated() { return items_updated_; }
 
   void ResetCounts() {
     status_changed_count_ = 0;
@@ skipping 12 matching lines @@
 };
 
 }  // namespace
 
 class AppListModelTest : public testing::Test {
  public:
   AppListModelTest() {}
   virtual ~AppListModelTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     model_.AddObserver(&observer_);
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     model_.RemoveObserver(&observer_);
   }
 
  protected:
   bool ItemObservedByFolder(AppListFolderItem* folder,
                             AppListItem* item) {
     return item->observers_.HasObserver(folder);
   }
 
   std::string GetItemListContents(AppListItemList* item_list) {
@@ skipping 135 matching lines @@
 }
 
 class AppListModelFolderTest : public AppListModelTest {
  public:
   AppListModelFolderTest() {
     model_.SetFoldersEnabled(true);
   }
   virtual ~AppListModelFolderTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AppListModelTest::SetUp();
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     AppListModelTest::TearDown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListModelFolderTest);
 };
 
 TEST_F(AppListModelFolderTest, FolderItem) {
   AppListFolderItem* folder =
       new AppListFolderItem("folder1", AppListFolderItem::FOLDER_TYPE_NORMAL);
@@ skipping 261 matching lines @@
   model_.SetFoldersEnabled(false);
   ASSERT_FALSE(model_.FindFolderItem(folder_id));
   ASSERT_TRUE(model_.FindFolderItem(oem_folder_id));
   EXPECT_EQ("Item 0,Item 1,oem_folder", GetModelContents());
 
   // Ensure folder creation fails.
   EXPECT_EQ(std::string(), model_.MergeItems(item0->id(), item1->id()));
 }
 
 }  // namespace app_list