| Index: dbus/object_manager_unittest.cc
|
| diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc
|
| index cd02c5e13c16ac96a2753900cbfeaf948e507145..76ddb85fa8f1f80864cf7a38c77cc42cb36b65e0 100644
|
| --- a/dbus/object_manager_unittest.cc
|
| +++ b/dbus/object_manager_unittest.cc
|
| @@ -48,10 +48,9 @@ class ObjectManagerTest
|
| }
|
| };
|
|
|
| - 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,
|
| @@ -59,7 +58,7 @@ class ObjectManagerTest
|
| return static_cast<PropertySet*>(properties);
|
| }
|
|
|
| - virtual void SetUp() {
|
| + void SetUp() override {
|
| // Make the main thread not to allow IO.
|
| base::ThreadRestrictions::SetIOAllowed(false);
|
|
|
| @@ -93,7 +92,7 @@ class ObjectManagerTest
|
| WaitForObject();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + void TearDown() override {
|
| bus_->ShutdownOnDBusThreadAndBlock();
|
|
|
| // Shut down the service.
|
| @@ -126,15 +125,15 @@ class ObjectManagerTest
|
|
|
| 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();
|
| }
|
|
|