Convert the remaining MOJO_OVERRIDE -> override, and get rid of MOJO_OVERRIDE.

(As a drive-by, also convert some OVERRIDE -> override.)

R=tim@chromium.org
TBR=scherkus@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#297435}

3 files changed, 18 insertions, 24 deletions

diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h
index 8b56ec3..6e7420b 100644
--- a/media/mojo/services/mojo_renderer_impl.h
+++ b/media/mojo/services/mojo_renderer_impl.h
@@ -47,22 +47,22 @@ class MojoRendererImpl : public Renderer, public mojo::MediaRendererClient {
                           const StatisticsCB& statistics_cb,
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb,
-                          const BufferingStateCB& buffering_state_cb) OVERRIDE;
-  virtual void Flush(const base::Closure& flush_cb) OVERRIDE;
-  virtual void StartPlayingFrom(base::TimeDelta time) OVERRIDE;
-  virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
-  virtual void SetVolume(float volume) OVERRIDE;
-  virtual base::TimeDelta GetMediaTime() OVERRIDE;
-  virtual bool HasAudio() OVERRIDE;
-  virtual bool HasVideo() OVERRIDE;
-  virtual void SetCdm(MediaKeys* cdm) OVERRIDE;
+                          const BufferingStateCB& buffering_state_cb) override;
+  virtual void Flush(const base::Closure& flush_cb) override;
+  virtual void StartPlayingFrom(base::TimeDelta time) override;
+  virtual void SetPlaybackRate(float playback_rate) override;
+  virtual void SetVolume(float volume) override;
+  virtual base::TimeDelta GetMediaTime() override;
+  virtual bool HasAudio() override;
+  virtual bool HasVideo() override;
+  virtual void SetCdm(MediaKeys* cdm) override;
 
   // mojo::MediaRendererClient implementation.
   virtual void OnTimeUpdate(int64_t time_usec,
-                            int64_t max_time_usec) MOJO_OVERRIDE;
-  virtual void OnBufferingStateChange(mojo::BufferingState state) MOJO_OVERRIDE;
-  virtual void OnEnded() MOJO_OVERRIDE;
-  virtual void OnError() MOJO_OVERRIDE;
+                            int64_t max_time_usec) override;
+  virtual void OnBufferingStateChange(mojo::BufferingState state) override;
+  virtual void OnEnded() override;
+  virtual void OnError() override;
 
  private:
   // Called when |remote_audio_renderer_| has finished initializing.
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
index 0459c31..e3f314e 100644
--- a/media/mojo/services/mojo_renderer_service.h
+++ b/media/mojo/services/mojo_renderer_service.h
@@ -38,11 +38,11 @@ class MojoRendererService : public mojo::InterfaceImpl<mojo::MediaRenderer> {
 
   // mojo::MediaRenderer implementation.
   virtual void Initialize(mojo::DemuxerStreamPtr stream,
-                          const mojo::Callback<void()>& callback) MOJO_OVERRIDE;
-  virtual void Flush(const mojo::Callback<void()>& callback) MOJO_OVERRIDE;
-  virtual void StartPlayingFrom(int64_t time_delta_usec) MOJO_OVERRIDE;
-  virtual void SetPlaybackRate(float playback_rate) MOJO_OVERRIDE;
-  virtual void SetVolume(float volume) MOJO_OVERRIDE;
+                          const mojo::Callback<void()>& callback) override;
+  virtual void Flush(const mojo::Callback<void()>& callback) override;
+  virtual void StartPlayingFrom(int64_t time_delta_usec) override;
+  virtual void SetPlaybackRate(float playback_rate) override;
+  virtual void SetVolume(float volume) override;
 
  private:
   // Called when the MojoDemuxerStreamAdapter is ready to go (has a config,
diff --git a/mojo/public/cpp/system/macros.h b/mojo/public/cpp/system/macros.h
index a655148..605906e 100644
--- a/mojo/public/cpp/system/macros.h
+++ b/mojo/public/cpp/system/macros.h
@@ -11,12 +11,6 @@
 // Mojo C++ API users can assume that mojo/public/cpp/system/macros.h
 // includes mojo/public/c/system/macros.h.
 
-// TODO(vtl): Get rid of this once all users have been eliminated.
-// Annotate a virtual method indicating it must be overriding a virtual method
-// in the parent class. Use like:
-//   virtual void foo() OVERRIDE;
-#define MOJO_OVERRIDE override
-
 // A macro to disallow the copy constructor and operator= functions.
 // This should be used in the private: declarations for a class.
 #define MOJO_DISALLOW_COPY_AND_ASSIGN(TypeName) \