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

Unified Diff: content/browser/renderer_host/media/video_capture_host_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_host_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index dd9ba733212972b5e80d5b92cbc0f22a5d289f7c..763ed1f9ca83edcafa1e45d3e0904002209de377 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -180,7 +180,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
}
private:
- virtual ~MockVideoCaptureHost() {
+ ~MockVideoCaptureHost() override {
STLDeleteContainerPairSecondPointers(filled_dib_.begin(),
filled_dib_.end());
}
@@ -188,7 +188,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
// This method is used to dispatch IPC messages to the renderer. We intercept
// these messages here and dispatch to our mock methods to verify the
// conversation between this object and the renderer.
- virtual bool Send(IPC::Message* message) override {
+ bool Send(IPC::Message* message) override {
CHECK(message);
// In this method we dispatch the messages to the according handlers as if
@@ -286,7 +286,7 @@ class VideoCaptureHostTest : public testing::Test {
message_loop_(base::MessageLoopProxy::current()),
opened_session_id_(kInvalidMediaCaptureSessionId) {}
- virtual void SetUp() override {
+ void SetUp() override {
SetBrowserClientForTesting(&browser_client_);
#if defined(OS_CHROMEOS)
@@ -309,7 +309,7 @@ class VideoCaptureHostTest : public testing::Test {
OpenSession();
}
- virtual void TearDown() override {
+ void TearDown() override {
// Verifies and removes the expectations on host_ and
// returns true iff successful.
Mock::VerifyAndClearExpectations(host_.get());

Powered by Google App Engine
This is Rietveld 408576698