Standardize usage of virtual/override/final specifiers in 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 30 matching lines @@
                const std::string& interface_name,
                PropertyChangedCallback property_changed_callback)
         : PropertySet(object_proxy, interface_name, property_changed_callback) {
       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 {
+  PropertySet* CreateProperties(ObjectProxy* object_proxy,
+                                const ObjectPath& object_path,
+                                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() {
+  void SetUp() override {
     // Make the main thread not to allow IO.
     base::ThreadRestrictions::SetIOAllowed(false);
 
     // Start the D-Bus thread.
     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
     base::Thread::Options thread_options;
     thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
     ASSERT_TRUE(dbus_thread_->StartWithOptions(thread_options));
 
     // Start the test service, using the D-Bus thread.
@@ skipping 13 matching lines @@
     ASSERT_TRUE(bus_->HasDBusThread());
 
     object_manager_ = bus_->GetObjectManager(
         "org.chromium.TestService",
         ObjectPath("/org/chromium/TestService"));
     object_manager_->RegisterInterface("org.chromium.TestInterface", this);
 
     WaitForObject();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     bus_->ShutdownOnDBusThreadAndBlock();
 
     // Shut down the service.
     test_service_->ShutdownAndBlock();
 
     // Reset to the default.
     base::ThreadRestrictions::SetIOAllowed(true);
 
     // Stopping a thread is considered an IO operation, so do this after
     // allowing IO.
@@ skipping 12 matching lines @@
   // signal before the timeout. This method immediately fails the test.
   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 {
+  void ObjectAdded(const ObjectPath& object_path,
+                   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 {
+  void ObjectRemoved(const ObjectPath& object_path,
+                     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