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

Unified Diff: media/base/android/media_source_player_unittest.cc

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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 | « media/base/android/media_source_player.h ('k') | media/base/android/video_decoder_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_source_player_unittest.cc
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc
index 50a5cdb72609eb5a51fd7eeb19e483af5482784c..9ac934eebd52cb7cb15c2080662e93277bb234dc 100644
--- a/media/base/android/media_source_player_unittest.cc
+++ b/media/base/android/media_source_player_unittest.cc
@@ -47,42 +47,39 @@ class MockMediaPlayerManager : public MediaPlayerManager {
num_resources_requested_(0),
num_metadata_changes_(0),
timestamp_updated_(false) {}
- virtual ~MockMediaPlayerManager() {}
+ ~MockMediaPlayerManager() override {}
// MediaPlayerManager implementation.
- virtual MediaResourceGetter* GetMediaResourceGetter() override {
- return NULL;
- }
- virtual MediaUrlInterceptor* GetMediaUrlInterceptor() override {
- return NULL;
- }
- virtual void OnTimeUpdate(int player_id,
- base::TimeDelta current_time,
- base::TimeTicks current_time_ticks) override {
+ MediaResourceGetter* GetMediaResourceGetter() override { return NULL; }
+ MediaUrlInterceptor* GetMediaUrlInterceptor() override { return NULL; }
+ void OnTimeUpdate(int player_id,
+ base::TimeDelta current_time,
+ base::TimeTicks current_time_ticks) override {
timestamp_updated_ = true;
}
- virtual void OnMediaMetadataChanged(
- int player_id, base::TimeDelta duration, int width, int height,
- bool success) override {
+ void OnMediaMetadataChanged(int player_id,
+ base::TimeDelta duration,
+ int width,
+ int height,
+ bool success) override {
num_metadata_changes_++;
}
- virtual void OnPlaybackComplete(int player_id) override {
+ void OnPlaybackComplete(int player_id) override {
playback_completed_ = true;
if (message_loop_->is_running())
message_loop_->Quit();
}
- virtual void OnMediaInterrupted(int player_id) override {}
- virtual void OnBufferingUpdate(int player_id, int percentage) override {}
- virtual void OnSeekComplete(int player_id,
- const base::TimeDelta& current_time) override {}
- virtual void OnError(int player_id, int error) override {}
- virtual void OnVideoSizeChanged(int player_id, int width,
- int height) override {}
- virtual MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; }
- virtual MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; }
- virtual void RequestFullScreen(int player_id) override {}
+ void OnMediaInterrupted(int player_id) override {}
+ void OnBufferingUpdate(int player_id, int percentage) override {}
+ void OnSeekComplete(int player_id,
+ const base::TimeDelta& current_time) override {}
+ void OnError(int player_id, int error) override {}
+ void OnVideoSizeChanged(int player_id, int width, int height) override {}
+ MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; }
+ MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; }
+ void RequestFullScreen(int player_id) override {}
#if defined(VIDEO_HOLE)
- virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override {
+ bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override {
return false;
}
#endif // defined(VIDEO_HOLE)
@@ -131,16 +128,16 @@ class MockDemuxerAndroid : public DemuxerAndroid {
num_data_requests_(0),
num_seek_requests_(0),
num_browser_seek_requests_(0) {}
- virtual ~MockDemuxerAndroid() {}
+ ~MockDemuxerAndroid() override {}
- virtual void Initialize(DemuxerAndroidClient* client) override {}
- virtual void RequestDemuxerData(DemuxerStream::Type type) override {
+ void Initialize(DemuxerAndroidClient* client) override {}
+ void RequestDemuxerData(DemuxerStream::Type type) override {
num_data_requests_++;
if (message_loop_->is_running())
message_loop_->Quit();
}
- virtual void RequestDemuxerSeek(const base::TimeDelta& time_to_seek,
- bool is_browser_seek) override {
+ void RequestDemuxerSeek(const base::TimeDelta& time_to_seek,
+ bool is_browser_seek) override {
num_seek_requests_++;
if (is_browser_seek)
num_browser_seek_requests_++;
@@ -177,7 +174,7 @@ class MediaSourcePlayerTest : public testing::Test {
GURL()),
decoder_callback_hook_executed_(false),
surface_texture_a_is_next_(true) {}
- virtual ~MediaSourcePlayerTest() {}
+ ~MediaSourcePlayerTest() override {}
protected:
// Get the decoder job from the MediaSourcePlayer. The return value must not
« no previous file with comments | « media/base/android/media_source_player.h ('k') | media/base/android/video_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698