Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1947)

Unified Diff: dbus/object_manager_unittest.cc

Issue 629883003: Replacing the OVERRIDE with override and FINAL with final in /src/dbus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/mock_object_proxy.h ('k') | dbus/object_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/object_manager_unittest.cc
diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc
index 54ddeacebd4fd0cc1cdf2d15face1c45b4eb9e62..cd02c5e13c16ac96a2753900cbfeaf948e507145 100644
--- a/dbus/object_manager_unittest.cc
+++ b/dbus/object_manager_unittest.cc
@@ -51,7 +51,7 @@ class ObjectManagerTest
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,
@@ -127,14 +127,14 @@ class ObjectManagerTest
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();
}
« no previous file with comments | « dbus/mock_object_proxy.h ('k') | dbus/object_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698