Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Unified Diff: content/renderer/media/rtc_video_decoder_unittest.cc

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/rtc_video_decoder_factory.h ('k') | content/renderer/media/rtc_video_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/rtc_video_decoder_unittest.cc
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index c0603441605f9a958b76e40cbd186cf550745190..b32440c50ed3a5fd3abfc9275fc375ae4c6c34aa 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -31,7 +31,7 @@ class RTCVideoDecoderTest : public ::testing::Test,
memset(&codec_, 0, sizeof(codec_));
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(vda_thread_.Start());
vda_task_runner_ = vda_thread_.message_loop_proxy();
mock_vda_ = new media::MockVideoDecodeAccelerator;
@@ -47,7 +47,7 @@ class RTCVideoDecoderTest : public ::testing::Test,
EXPECT_CALL(*mock_vda_, Destroy()).Times(1);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
VLOG(2) << "TearDown";
EXPECT_TRUE(vda_thread_.IsRunning());
RunUntilIdle(); // Wait until all callbascks complete.
@@ -57,7 +57,7 @@ class RTCVideoDecoderTest : public ::testing::Test,
vda_thread_.Stop();
}
- virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) OVERRIDE {
+ virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) override {
VLOG(2) << "Decoded";
EXPECT_EQ(vda_task_runner_, base::MessageLoopProxy::current());
return WEBRTC_VIDEO_CODEC_OK;
« no previous file with comments | « content/renderer/media/rtc_video_decoder_factory.h ('k') | content/renderer/media/rtc_video_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698