Mojo: Cleanup: MOJO_OVERRIDE -> OVERRIDE in places where we use base/.

(mojo/public/ has MOJO_OVERRIDE, since it can't use base/, but we should
use the regular OVERRIDE where we can use base/.)

R=sky@chromium.org

Review URL: https://codereview.chromium.org/202733002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257665 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 0f63478..b5843cf4 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -6,6 +6,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/error_handler.h"
 #include "mojo/public/bindings/remote_ptr.h"
@@ -34,11 +35,11 @@ class ServiceManager::ServiceFactory : public Shell, public ErrorHandler {
   }
 
   virtual void Connect(const String& url,
-                       ScopedMessagePipeHandle client_pipe) MOJO_OVERRIDE {
+                       ScopedMessagePipeHandle client_pipe) OVERRIDE {
     manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
   }
 
-  virtual void OnError() MOJO_OVERRIDE {
+  virtual void OnError() OVERRIDE {
     manager_->RemoveServiceFactory(this);
   }