diff options
Diffstat (limited to 'chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index d546d2a..7c838f7 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc @@ -37,7 +37,7 @@ namespace extensions { class CastStreamingApiTest : public ExtensionApiTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, @@ -155,7 +155,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { // Invoked by InProcessReceiver for each received audio frame. virtual void OnAudioFrame(scoped_ptr<media::AudioBus> audio_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); if (audio_frame->frames() <= 0) { @@ -194,7 +194,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { virtual void OnVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); CHECK(video_frame->format() == media::VideoFrame::YV12 || @@ -316,12 +316,12 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { } // namespace class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest { - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); CastStreamingApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitchASCII(::switches::kWindowSize, "128,128"); CastStreamingApiTest::SetUpCommandLine(command_line); } |