Index: media/mojo/services/renderer_unittest.cc |
diff --git a/media/mojo/services/renderer_unittest.cc b/media/mojo/services/renderer_unittest.cc |
index e9fbb67770fe4cd507dcf78a22e20258093fa527..830592da2b3cf6a9488ca88cd36f7d799386c7b2 100644 |
--- a/media/mojo/services/renderer_unittest.cc |
+++ b/media/mojo/services/renderer_unittest.cc |
@@ -28,7 +28,7 @@ class MojoRendererTestHelper : public mojo::ApplicationDelegate { |
virtual ~MojoRendererTestHelper() {} |
// ApplicationDelegate implementation. |
- virtual void Initialize(mojo::ApplicationImpl* app) OVERRIDE { |
+ virtual void Initialize(mojo::ApplicationImpl* app) override { |
application_impl_ = app; |
} |
@@ -53,18 +53,18 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, |
// media::Demuxer implementation. |
virtual media::DemuxerStream* GetStream( |
- media::DemuxerStream::Type type) OVERRIDE { |
+ media::DemuxerStream::Type type) override { |
DCHECK_EQ(media::DemuxerStream::AUDIO, type); |
return this; |
} |
- virtual media::DemuxerStreamProvider::Liveness GetLiveness() const OVERRIDE { |
+ virtual media::DemuxerStreamProvider::Liveness GetLiveness() const override { |
return media::DemuxerStreamProvider::LIVENESS_UNKNOWN; |
} |
// media::DemuxerStream implementation. |
- virtual void Read(const ReadCB& read_cb) OVERRIDE {} |
+ virtual void Read(const ReadCB& read_cb) override {} |
- virtual media::AudioDecoderConfig audio_decoder_config() OVERRIDE { |
+ virtual media::AudioDecoderConfig audio_decoder_config() override { |
media::AudioDecoderConfig config; |
config.Initialize(media::kCodecAAC, |
media::kSampleFormatU8, |
@@ -79,20 +79,20 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, |
return config; |
} |
- virtual media::VideoDecoderConfig video_decoder_config() OVERRIDE { |
+ virtual media::VideoDecoderConfig video_decoder_config() override { |
NOTREACHED(); |
return media::VideoDecoderConfig(); |
} |
- virtual media::DemuxerStream::Type type() OVERRIDE { |
+ virtual media::DemuxerStream::Type type() override { |
return media::DemuxerStream::AUDIO; |
} |
- virtual void EnableBitstreamConverter() OVERRIDE {} |
+ virtual void EnableBitstreamConverter() override {} |
- virtual bool SupportsConfigChanges() OVERRIDE { return true; } |
+ virtual bool SupportsConfigChanges() override { return true; } |
- virtual media::VideoRotation video_rotation() OVERRIDE { |
+ virtual media::VideoRotation video_rotation() override { |
NOTREACHED(); |
return media::VIDEO_ROTATION_0; |
} |
@@ -109,7 +109,7 @@ class MojoRendererTest : public testing::Test { |
public: |
MojoRendererTest() : service_provider_(NULL) {} |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
demuxer_stream_provider_.reset(new FakeDemuxerStream()); |
service_provider_ = |
g_test_delegate->application_impl() |