Index: content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
index 30b314e1371bd8b673fafea1c860ff715fb750f9..e391d11ed4ec509b23692d2d594372d8ee21d659 100644 |
--- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
@@ -39,15 +39,15 @@ class MockVideoDecodeAcceleratorClient |
// VideoDecodeAccelerator::Client implementation. |
virtual void ProvidePictureBuffers(uint32 requested_num_of_buffers, |
const gfx::Size& dimensions, |
- uint32 texture_target) OVERRIDE {}; |
- virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE {}; |
- virtual void PictureReady(const media::Picture& picture) OVERRIDE {}; |
+ uint32 texture_target) override {}; |
+ virtual void DismissPictureBuffer(int32 picture_buffer_id) override {}; |
+ virtual void PictureReady(const media::Picture& picture) override {}; |
virtual void NotifyEndOfBitstreamBuffer( |
- int32 bitstream_buffer_id) OVERRIDE {}; |
- virtual void NotifyFlushDone() OVERRIDE {}; |
- virtual void NotifyResetDone() OVERRIDE {}; |
+ int32 bitstream_buffer_id) override {}; |
+ virtual void NotifyFlushDone() override {}; |
+ virtual void NotifyResetDone() override {}; |
virtual void NotifyError( |
- media::VideoDecodeAccelerator::Error error) OVERRIDE {}; |
+ media::VideoDecodeAccelerator::Error error) override {}; |
}; |
class AndroidVideoDecodeAcceleratorTest : public testing::Test { |
@@ -55,7 +55,7 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test { |
virtual ~AndroidVideoDecodeAcceleratorTest() {} |
protected: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
JNIEnv* env = base::android::AttachCurrentThread(); |
media::RegisterJni(env); |
// TODO(felipeg): fix GL bindings, so that the decoder can perform GL |