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

Unified Diff: content/renderer/media/user_media_client_impl_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/user_media_client_impl.h ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/user_media_client_impl_unittest.cc
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index 386ce3416fb743787ad3144abca94b2346f6e3c5..dba46e918374610371964f845d7e4891b59c229f 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -77,14 +77,14 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl {
virtual void GetUserMediaRequestSucceeded(
const blink::WebMediaStream& stream,
- blink::WebUserMediaRequest* request_info) OVERRIDE {
+ blink::WebUserMediaRequest* request_info) override {
last_generated_stream_ = stream;
state_ = REQUEST_SUCCEEDED;
}
virtual void GetUserMediaRequestFailed(
blink::WebUserMediaRequest* request_info,
- content::MediaStreamRequestResult result) OVERRIDE {
+ content::MediaStreamRequestResult result) override {
last_generated_stream_.reset();
state_ = REQUEST_FAILED;
result_ = result;
@@ -93,7 +93,7 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl {
virtual void GetUserMediaRequestTrackStartedFailed(
blink::WebUserMediaRequest* request_info,
MediaStreamRequestResult result,
- const blink::WebString& result_name) OVERRIDE {
+ const blink::WebString& result_name) override {
last_generated_stream_.reset();
state_ = REQUEST_FAILED;
result_ = result;
@@ -102,21 +102,21 @@ class UserMediaClientImplUnderTest : public UserMediaClientImpl {
virtual void EnumerateDevicesSucceded(
blink::WebMediaDevicesRequest* request,
- blink::WebVector<blink::WebMediaDeviceInfo>& devices) OVERRIDE {
+ blink::WebVector<blink::WebMediaDeviceInfo>& devices) override {
state_ = REQUEST_SUCCEEDED;
last_devices_ = devices;
}
virtual void EnumerateSourcesSucceded(
blink::WebMediaStreamTrackSourcesRequest* request,
- blink::WebVector<blink::WebSourceInfo>& sources) OVERRIDE {
+ blink::WebVector<blink::WebSourceInfo>& sources) override {
state_ = REQUEST_SUCCEEDED;
last_sources_ = sources;
}
virtual MediaStreamVideoSource* CreateVideoSource(
const StreamDeviceInfo& device,
- const MediaStreamSource::SourceStoppedCallback& stop_callback) OVERRIDE {
+ const MediaStreamSource::SourceStoppedCallback& stop_callback) override {
video_source_ = new MockMediaStreamVideoCapturerSource(device,
stop_callback,
factory_);
@@ -170,7 +170,7 @@ class UserMediaClientImplTest : public ::testing::Test {
scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass()));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
used_media_impl_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
« no previous file with comments | « content/renderer/media/user_media_client_impl.h ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698