content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc - Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc/media_stream_track_metrics_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/webrtc/media_stream_track_metrics.cc ('k') | content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc

diff --git a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc

index c2466e83045f29b887fbb67d4de2d7917feec831..e001c02ac5c4bc2212799747873537e97b6dd58b 100644

--- a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc

+++ b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc

@@ -26,7 +26,7 @@ class MockAudioTrackInterface : public AudioTrackInterface {

explicit MockAudioTrackInterface(const std::string& id) : id_(id) {}

virtual ~MockAudioTrackInterface() {}

- virtual std::string id() const OVERRIDE { return id_; }

+ virtual std::string id() const override { return id_; }

MOCK_METHOD1(RegisterObserver, void(ObserverInterface*));

MOCK_METHOD1(UnregisterObserver, void(ObserverInterface*));

@@ -49,7 +49,7 @@ class MockVideoTrackInterface : public VideoTrackInterface {

explicit MockVideoTrackInterface(const std::string& id) : id_(id) {}

virtual ~MockVideoTrackInterface() {}

- virtual std::string id() const OVERRIDE { return id_; }

+ virtual std::string id() const override { return id_; }

MOCK_METHOD1(RegisterObserver, void(ObserverInterface*));

MOCK_METHOD1(UnregisterObserver, void(ObserverInterface*));

@@ -78,12 +78,12 @@ class MockMediaStreamTrackMetrics : public MediaStreamTrackMetrics {

class MediaStreamTrackMetricsTest : public testing::Test {

public:

- virtual void SetUp() OVERRIDE {

+ virtual void SetUp() override {

metrics_.reset(new MockMediaStreamTrackMetrics());

stream_ = new rtc::RefCountedObject<MockMediaStream>("stream");

}

- virtual void TearDown() OVERRIDE {

+ virtual void TearDown() override {

metrics_.reset();

stream_ = NULL;

}