content/browser/renderer_host/media/video_capture_manager_unittest.cc - Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host

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/browser/renderer_host/media/video_capture_manager_unittest.cc

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased the patch 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/browser/renderer_host/media/video_capture_manager.h ('k') | content/browser/renderer_host/media/webrtc_identity_service_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc

index f27f5a5ef254eef1654690d113c6072553296c6f..f033effcb77003144b96f6c01c312a83dc82f164 100644

--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc

@@ -48,20 +48,20 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {

virtual void OnBufferCreated(const VideoCaptureControllerID& id,

base::SharedMemoryHandle handle,

- int length, int buffer_id) OVERRIDE {}

+ int length, int buffer_id) override {}

virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,

- int buffer_id) OVERRIDE {}

+ int buffer_id) override {}

virtual void OnBufferReady(const VideoCaptureControllerID& id,

int buffer_id,

const media::VideoCaptureFormat& format,

const gfx::Rect& visible_rect,

- base::TimeTicks timestamp) OVERRIDE {}

+ base::TimeTicks timestamp) override {}

virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,

int buffer_id,

const gpu::MailboxHolder& mailbox_holder,

const media::VideoCaptureFormat& format,

- base::TimeTicks timestamp) OVERRIDE {}

- virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {}

+ base::TimeTicks timestamp) override {}

+ virtual void OnEnded(const VideoCaptureControllerID& id) override {}

void OnGotControllerCallback(VideoCaptureControllerID) {}

};

@@ -73,7 +73,7 @@ class VideoCaptureManagerTest : public testing::Test {

virtual ~VideoCaptureManagerTest() {}

protected:

- virtual void SetUp() OVERRIDE {

+ virtual void SetUp() override {

listener_.reset(new MockMediaStreamProviderListener());

message_loop_.reset(new base::MessageLoopForIO);

io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,

@@ -89,7 +89,7 @@ class VideoCaptureManagerTest : public testing::Test {

frame_observer_.reset(new MockFrameObserver());

}

- virtual void TearDown() OVERRIDE {}

+ virtual void TearDown() override {}

void OnGotControllerCallback(

VideoCaptureControllerID id,