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

dbus/mock_object_proxy.h

Index: dbus/mock_object_proxy.h
diff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h
index b5900ad32e3885b70fb389fc12378ae604914c15..7c61b47b42802272d40f6f8aadcb6487cd8e2349 100644
--- a/dbus/mock_object_proxy.h
+++ b/dbus/mock_object_proxy.h
@@ -32,14 +32,14 @@ class MockObjectProxy : public ObjectProxy {
   virtual scoped_ptr<Response> CallMethodAndBlockWithErrorDetails(
       MethodCall* method_call,
       int timeout_ms,
-      ScopedDBusError* error) OVERRIDE {
+      ScopedDBusError* error) override {
     return scoped_ptr<Response>(
         MockCallMethodAndBlockWithErrorDetails(method_call, timeout_ms, error));
   }
   MOCK_METHOD2(MockCallMethodAndBlock, Response*(MethodCall* method_call,
                                                  int timeout_ms));
   virtual scoped_ptr<Response> CallMethodAndBlock(MethodCall* method_call,
-                                                  int timeout_ms) OVERRIDE {
+                                                  int timeout_ms) override {
     return scoped_ptr<Response>(MockCallMethodAndBlock(method_call,
                                                        timeout_ms));
   }