diff options
author | mostynb <mostynb@opera.com> | 2014-10-03 17:40:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 00:40:55 +0000 |
commit | a15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch) | |
tree | 10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/api/cast_streaming/performance_test.cc | |
parent | e7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff) | |
download | chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2 |
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463
Review URL: https://codereview.chromium.org/624153002
Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/api/cast_streaming/performance_test.cc')
-rw-r--r-- | chrome/browser/extensions/api/cast_streaming/performance_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 07b3f5d..8234ede 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -81,7 +81,7 @@ class SkewedTickClock : public base::DefaultTickClock { public: explicit SkewedTickClock(const base::TimeDelta& delta) : delta_(delta) { } - virtual base::TimeTicks NowTicks() OVERRIDE { + virtual base::TimeTicks NowTicks() override { return DefaultTickClock::NowTicks() + delta_; } private: @@ -241,7 +241,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 { CHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); if (audio_frame->frames() <= 0) { @@ -262,7 +262,7 @@ class TestPatternReceiver : public media::cast::InProcessReceiver { virtual void OnVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& render_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { CHECK(cast_env()->CurrentlyOn(media::cast::CastEnvironment::MAIN)); TRACE_EVENT_INSTANT1( @@ -355,12 +355,12 @@ class CastV2PerformanceTest return endpoint; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EnablePixelOutput(); ExtensionApiTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { // Some of the tests may launch http requests through JSON or AJAX // which causes a security error (cross domain request) when the page // is loaded from the local file system ( file:// ). The following switch |