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

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class MockMediaPlayerManager : public MediaPlayerManager { 42 class MockMediaPlayerManager : public MediaPlayerManager {
43 public: 43 public:
44 explicit MockMediaPlayerManager(base::MessageLoop* message_loop) 44 explicit MockMediaPlayerManager(base::MessageLoop* message_loop)
45 : message_loop_(message_loop), 45 : message_loop_(message_loop),
46 playback_completed_(false), 46 playback_completed_(false),
47 num_resources_requested_(0), 47 num_resources_requested_(0),
48 timestamp_updated_(false) {} 48 timestamp_updated_(false) {}
49 virtual ~MockMediaPlayerManager() {} 49 virtual ~MockMediaPlayerManager() {}
50 50
51 // MediaPlayerManager implementation. 51 // MediaPlayerManager implementation.
52 virtual MediaResourceGetter* GetMediaResourceGetter() OVERRIDE { 52 virtual MediaResourceGetter* GetMediaResourceGetter() override {
53 return NULL; 53 return NULL;
54 } 54 }
55 virtual MediaUrlInterceptor* GetMediaUrlInterceptor() OVERRIDE { 55 virtual MediaUrlInterceptor* GetMediaUrlInterceptor() override {
56 return NULL; 56 return NULL;
57 } 57 }
58 virtual void OnTimeUpdate(int player_id, 58 virtual void OnTimeUpdate(int player_id,
59 base::TimeDelta current_time, 59 base::TimeDelta current_time,
60 base::TimeTicks current_time_ticks) OVERRIDE { 60 base::TimeTicks current_time_ticks) override {
61 timestamp_updated_ = true; 61 timestamp_updated_ = true;
62 } 62 }
63 virtual void OnMediaMetadataChanged( 63 virtual void OnMediaMetadataChanged(
64 int player_id, base::TimeDelta duration, int width, int height, 64 int player_id, base::TimeDelta duration, int width, int height,
65 bool success) OVERRIDE {} 65 bool success) override {}
66 virtual void OnPlaybackComplete(int player_id) OVERRIDE { 66 virtual void OnPlaybackComplete(int player_id) override {
67 playback_completed_ = true; 67 playback_completed_ = true;
68 if (message_loop_->is_running()) 68 if (message_loop_->is_running())
69 message_loop_->Quit(); 69 message_loop_->Quit();
70 } 70 }
71 virtual void OnMediaInterrupted(int player_id) OVERRIDE {} 71 virtual void OnMediaInterrupted(int player_id) override {}
72 virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE {} 72 virtual void OnBufferingUpdate(int player_id, int percentage) override {}
73 virtual void OnSeekComplete(int player_id, 73 virtual void OnSeekComplete(int player_id,
74 const base::TimeDelta& current_time) OVERRIDE {} 74 const base::TimeDelta& current_time) override {}
75 virtual void OnError(int player_id, int error) OVERRIDE {} 75 virtual void OnError(int player_id, int error) override {}
76 virtual void OnVideoSizeChanged(int player_id, int width, 76 virtual void OnVideoSizeChanged(int player_id, int width,
77 int height) OVERRIDE {} 77 int height) override {}
78 virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; } 78 virtual MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; }
79 virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; } 79 virtual MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; }
80 virtual void RequestFullScreen(int player_id) OVERRIDE {} 80 virtual void RequestFullScreen(int player_id) override {}
81 #if defined(VIDEO_HOLE) 81 #if defined(VIDEO_HOLE)
82 virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() OVERRIDE { 82 virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override {
83 return false; 83 return false;
84 } 84 }
85 #endif // defined(VIDEO_HOLE) 85 #endif // defined(VIDEO_HOLE)
86 86
87 bool playback_completed() const { 87 bool playback_completed() const {
88 return playback_completed_; 88 return playback_completed_;
89 } 89 }
90 90
91 int num_resources_requested() const { 91 int num_resources_requested() const {
92 return num_resources_requested_; 92 return num_resources_requested_;
(...skipping 24 matching lines...) Expand all
117 117
118 class MockDemuxerAndroid : public DemuxerAndroid { 118 class MockDemuxerAndroid : public DemuxerAndroid {
119 public: 119 public:
120 explicit MockDemuxerAndroid(base::MessageLoop* message_loop) 120 explicit MockDemuxerAndroid(base::MessageLoop* message_loop)
121 : message_loop_(message_loop), 121 : message_loop_(message_loop),
122 num_data_requests_(0), 122 num_data_requests_(0),
123 num_seek_requests_(0), 123 num_seek_requests_(0),
124 num_browser_seek_requests_(0) {} 124 num_browser_seek_requests_(0) {}
125 virtual ~MockDemuxerAndroid() {} 125 virtual ~MockDemuxerAndroid() {}
126 126
127 virtual void Initialize(DemuxerAndroidClient* client) OVERRIDE {} 127 virtual void Initialize(DemuxerAndroidClient* client) override {}
128 virtual void RequestDemuxerData(DemuxerStream::Type type) OVERRIDE { 128 virtual void RequestDemuxerData(DemuxerStream::Type type) override {
129 num_data_requests_++; 129 num_data_requests_++;
130 if (message_loop_->is_running()) 130 if (message_loop_->is_running())
131 message_loop_->Quit(); 131 message_loop_->Quit();
132 } 132 }
133 virtual void RequestDemuxerSeek(const base::TimeDelta& time_to_seek, 133 virtual void RequestDemuxerSeek(const base::TimeDelta& time_to_seek,
134 bool is_browser_seek) OVERRIDE { 134 bool is_browser_seek) override {
135 num_seek_requests_++; 135 num_seek_requests_++;
136 if (is_browser_seek) 136 if (is_browser_seek)
137 num_browser_seek_requests_++; 137 num_browser_seek_requests_++;
138 } 138 }
139 139
140 int num_data_requests() const { return num_data_requests_; } 140 int num_data_requests() const { return num_data_requests_; }
141 int num_seek_requests() const { return num_seek_requests_; } 141 int num_seek_requests() const { return num_seek_requests_; }
142 int num_browser_seek_requests() const { return num_browser_seek_requests_; } 142 int num_browser_seek_requests() const { return num_browser_seek_requests_; }
143 143
144 private: 144 private:
(...skipping 2107 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 2252
2253 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true); 2253 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true);
2254 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged( 2254 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(
2255 true, 0, configs); 2255 true, 0, configs);
2256 player_.OnDemuxerDataAvailable(data); 2256 player_.OnDemuxerDataAvailable(data);
2257 WaitForAudioDecodeDone(); 2257 WaitForAudioDecodeDone();
2258 DecodeAudioDataUntilOutputBecomesAvailable(); 2258 DecodeAudioDataUntilOutputBecomesAvailable();
2259 } 2259 }
2260 2260
2261 } // namespace media 2261 } // namespace media
OLDNEW
« 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