Index: chrome/browser/extensions/api/cast_streaming/performance_test.cc |
diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc |
index 07b3f5d439c3c5f5a4dd3ccf939924e94632732b..8234edee4f7d40f874954b66acc1f7866e619e64 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 |