Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Unified Diff: content/browser/renderer_host/media/video_capture_controller_unittest.cc

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 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
Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index ad9ecd4cc53f8358d3c121055fc44d935bba7bd7..24f20737aae427e5d41b3aac38f35b956d76eb69 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -43,7 +43,7 @@ class MockVideoCaptureControllerEventHandler
explicit MockVideoCaptureControllerEventHandler(
VideoCaptureController* controller)
: controller_(controller) {}
- virtual ~MockVideoCaptureControllerEventHandler() {}
+ ~MockVideoCaptureControllerEventHandler() override {}
// These mock methods are delegated to by our fake implementation of
// VideoCaptureControllerEventHandler, to be used in EXPECT_CALL().
@@ -54,19 +54,18 @@ class MockVideoCaptureControllerEventHandler
MOCK_METHOD1(DoEnded, void(VideoCaptureControllerID));
MOCK_METHOD1(DoError, void(VideoCaptureControllerID));
- virtual void OnError(VideoCaptureControllerID id) override {
+ void OnError(VideoCaptureControllerID id) override {
DoError(id);
}
- virtual void OnBufferCreated(VideoCaptureControllerID id,
- base::SharedMemoryHandle handle,
- int length, int buffer_id) override {
+ void OnBufferCreated(VideoCaptureControllerID id,
+ base::SharedMemoryHandle handle,
+ int length, int buffer_id) override {
DoBufferCreated(id);
}
- virtual void OnBufferDestroyed(VideoCaptureControllerID id,
- int buffer_id) override {
+ void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {
DoBufferDestroyed(id);
}
- virtual void OnBufferReady(
+ void OnBufferReady(
VideoCaptureControllerID id,
int buffer_id,
const gfx::Size& coded_size,
@@ -83,7 +82,7 @@ class MockVideoCaptureControllerEventHandler
buffer_id,
0));
}
- virtual void OnMailboxBufferReady(
+ void OnMailboxBufferReady(
VideoCaptureControllerID id,
int buffer_id,
const gpu::MailboxHolder& mailbox_holder,
@@ -100,7 +99,7 @@ class MockVideoCaptureControllerEventHandler
buffer_id,
mailbox_holder.sync_point));
}
- virtual void OnEnded(VideoCaptureControllerID id) override {
+ void OnEnded(VideoCaptureControllerID id) override {
DoEnded(id);
// OnEnded() must respond by (eventually) unregistering the client.
base::MessageLoop::current()->PostTask(FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698