replace OVERRIDE and FINAL with override and final in ash/

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 {
+  virtual void ShelfItemAdded(int index) override {
     added_count_++;
   }
-  virtual void ShelfItemRemoved(int index, ShelfID id) OVERRIDE {
+  virtual void ShelfItemRemoved(int index, ShelfID id) override {
     removed_count_++;
   }
   virtual void ShelfItemChanged(int index,
-                                const ShelfItem& old_item) OVERRIDE {
+                                const ShelfItem& old_item) override {
     changed_count_++;
   }
-  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE {
+  virtual void ShelfItemMoved(int start_index, int target_index) override {
     moved_count_++;
   }
-  virtual void ShelfStatusChanged() OVERRIDE {
+  virtual 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);
   }
@@ skipping 282 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