Standardize usage of virtual/override/final specifiers.

ash/shelf/shelf_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 "ash/shelf/shelf_model.h"
 
 #include <set>
 #include <string>
 
 #include "ash/ash_switches.h"
@@ skipping 22 matching lines @@
     std::string result;
     AddToResult("added=%d", added_count_, &result);
     AddToResult("removed=%d", removed_count_, &result);
     AddToResult("changed=%d", changed_count_, &result);
     AddToResult("moved=%d", moved_count_, &result);
     added_count_ = removed_count_ = changed_count_ = moved_count_ = 0;
     return result;
   }
 
   // ShelfModelObserver overrides:
-  virtual void ShelfItemAdded(int index) override {
-    added_count_++;
-  }
-  virtual void ShelfItemRemoved(int index, ShelfID id) override {
-    removed_count_++;
-  }
-  virtual void ShelfItemChanged(int index,
-                                const ShelfItem& old_item) override {
+  void ShelfItemAdded(int index) override { added_count_++; }
+  void ShelfItemRemoved(int index, ShelfID id) override { removed_count_++; }
+  void ShelfItemChanged(int index, const ShelfItem& old_item) override {
     changed_count_++;
   }
-  virtual void ShelfItemMoved(int start_index, int target_index) override {
+  void ShelfItemMoved(int start_index, int target_index) override {
     moved_count_++;
   }
-  virtual void ShelfStatusChanged() override {
-  }
+  void ShelfStatusChanged() override {}
 
  private:
   void AddToResult(const std::string& format, int count, std::string* result) {
     if (!count)
       return;
     if (!result->empty())
       *result += " ";
     *result += base::StringPrintf(format.c_str(), count);
   }
 
   int added_count_;
   int removed_count_;
   int changed_count_;
   int moved_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfModelObserver);
 };
 
 }  // namespace
 
 class ShelfModelTest : public testing::Test {
  public:
   ShelfModelTest() {}
-  virtual ~ShelfModelTest() {}
+  ~ShelfModelTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     model_.reset(new ShelfModel);
     observer_.reset(new TestShelfModelObserver);
     EXPECT_EQ(0, model_->item_count());
 
     ShelfItem item;
     item.type = TYPE_APP_LIST;
     model_->Add(item);
     EXPECT_EQ(1, model_->item_count());
 
     model_->AddObserver(observer_.get());
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     observer_.reset();
     model_.reset();
   }
 
   scoped_ptr<ShelfModel> model_;
   scoped_ptr<TestShelfModelObserver> observer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShelfModelTest);
 };
@@ skipping 242 matching lines @@
   // Now change the type of the second item and make sure that it is moving
   // behind the shortcuts.
   item.type = TYPE_PLATFORM_APP;
   model_->Set(app2_index, item);
 
   // The item should have moved in front of the app launcher.
   EXPECT_EQ(TYPE_PLATFORM_APP, model_->items()[4].type);
 }
 
 }  // namespace ash