Replacing the OVERRIDE with override and FINAL with final in /src/dbus

dbus/object_manager_unittest.cc

 // Copyright (c) 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 "dbus/object_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 33 matching lines @@
       RegisterProperty("Name", &name);
       RegisterProperty("Version", &version);
       RegisterProperty("Methods", &methods);
       RegisterProperty("Objects", &objects);
     }
   };
 
   virtual PropertySet* CreateProperties(
       ObjectProxy* object_proxy,
       const ObjectPath& object_path,
-      const std::string& interface_name) OVERRIDE {
+      const std::string& interface_name) override {
     Properties* properties = new Properties(
         object_proxy, interface_name,
         base::Bind(&ObjectManagerTest::OnPropertyChanged,
                    base::Unretained(this), object_path));
     return static_cast<PropertySet*>(properties);
   }
 
   virtual void SetUp() {
     // Make the main thread not to allow IO.
     base::ThreadRestrictions::SetIOAllowed(false);
@@ skipping 55 matching lines @@
   void PropertiesChangedTestTimeout() {
     timeout_expired_ = true;
     run_loop_->Quit();
 
     FAIL() << "Never received PropertiesChanged";
   }
 
  protected:
   // Called when an object is added.
   virtual void ObjectAdded(const ObjectPath& object_path,
-                           const std::string& interface_name) OVERRIDE {
+                           const std::string& interface_name) override {
     added_objects_.push_back(std::make_pair(object_path, interface_name));
     run_loop_->Quit();
   }
 
   // Called when an object is removed.
   virtual void ObjectRemoved(const ObjectPath& object_path,
-                             const std::string& interface_name) OVERRIDE {
+                             const std::string& interface_name) override {
     removed_objects_.push_back(std::make_pair(object_path, interface_name));
     run_loop_->Quit();
   }
 
   // Called when a property value is updated.
   void OnPropertyChanged(const ObjectPath& object_path,
                          const std::string& name) {
     // Store the value of the "Name" property if that's the one that
     // changed.
     Properties* properties = static_cast<Properties*>(
@@ skipping 261 matching lines @@
                  base::Unretained(this)),
       base::TimeDelta::FromSeconds(2));
 
   while (last_name_value_ != "ChangedTestServiceName" && !timeout_expired_) {
     run_loop_.reset(new base::RunLoop);
     run_loop_->Run();
   }
 }
 
 }  // namespace dbus